I'm an idiot.
Merge remote-tracking branch 'origin/master'
Ascii-art? Nono!