The Merge Conflicts