fixup merge conflict