add index.html
remove unmerged file and pull from repository