I'm sorry will go thru and fix conflicts

Then I ought to be up to date. I am not loving git
Fixing up things