fix up bad merge