Removing bad merge message