Reparation de merge