Whoops, copy/pasted wrong
Merge remote-tracking branch 'origin/master'