Fixing broken merge conflict resolution