fixing a bad merge