do the whole thing
Merge remote-tracking branch 'origin/master'