index.html merge changes removed