Fixup bad merge problem