Cleaned up index.html
fixed conflict