fix a bad merge