fixing merge issue on index.html