index.html updated
index conflicts