correction de merge