Fixup merge errors