Merge index.html changes to index.hjs