Missed index.html in merge conflict