Update test.html

rebase conflict