fixup merge errors