Fix merge issue with index.html