commited second in local branch
Update index.html

committed in remote repository
conflict resolved second