This, should fix everything.
Merge remote-tracking branch 'origin/master'