Correct the merge