probleme merge