resolve content conflicts

I've gone through all the content files resolving conflicts manually, it
seemed to be the only way, I favoured any created in the detached head,
hopefully I haven't mistakenly lost any of your content changes, boom!