map analysis made, squash commit of all the commits i made because apparently the .git folder didnt copy.  will add the orig commits later
adjacent contents merge added
well crap.  now we wait.  again.
still no dice, I think I fixed it tho, will run @ home