Fix conflicts in index.html