Fixup merge