Removing bad merge.