probleme de merge