code (un peu) plus propre
Merge remote-tracking branch 'origin/master'