correcting the conflicts

I think that I accidentally deleted some of Alan's changes in the html.
I think I have brought them all back