Cleaned up index.html
fixed merge conflicts