What is going on here?
Merge remote-tracking branch 'origin/master'