fixup merge error