butcher the repo so that it minimally works (sorry)
Merge remote-tracking branch 'origin/master'