Fixed conflicts on index.html