fixed conflict in index.html