Further merge conflict resolution