fix up a bad merge