Gestion du click sur un conflit
Merge branch 'dev' of github.com:JordanAupetit/lkc-bdx into dev