Conflict Merge
Merge conflict resolution