Bring back index.html
index.html merge conflict.