There is no objectively correct way to do the merge, but there are ways that are obviously wrong.