removing bad merge