Fixup merge error