commit*ligne
Merge remote-tracking branch 'origin/master'
commit*meme*ligne
commit*conflict