Oh man.
Merge remote-tracking branch 'origin/master'
Please work now!