Resolved the conflict between edits