fix results of bad merge