resolution probleme de merge ?