Fix up the merge conflict resolution