Fixed merge issue with index.html