on provoque un conflit
Merge remote-tracking branch 'origin/master'
j’ai mergé