Correcting the merge