Merge conflict resolution.