redid a merge, messing with git, mostly.