Removing bad merge modif