Resolved conflict between revisions