Cleaned up index.html
Fixed merge conflicts