Change index.html
Add some text to index.html
resolve conflicts