Gestion conflict merge