Yeah, I had conflicts too so I just grabbed your most current, dropped it on top of my fork and made what are a very few minor tweaks. There should be only a few edits, many of which were the removal of extra causing whitespace in Process and Practises. If you did that yourself without merging, you'd nail most of it. I can just send you notes on the others after the fact. By the way Github baffles me a good bit of the time so blame me for that.