Correct versions of html files

Correct versions of html files - merge failed first time