Tidy up commit, messes have been manually merged

which is a ding against binary files for sure.