change index.html.
add some text to index.html.
resolve conflicts.