Ajout, modif, sup client
gestion conflic merge