Merge conflict resolution improvements