Add line 'conflict'
Merge branch 'master' of https://github.com/Quinto2/Qualite-Logicielle