Finished fixing conflict in index.html