udpate html index
merge conflict