ajout conflict