Quick fix, doesn't count...
Merge remote-tracking branch 'origin/master'