Merge conflict resolution