Fixup the merge