refactoring 1
reglage conflit