FIXUP: bad merge lost change