Merge branch 'master', remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
temps
conflicts