Update test2.html

Test conflict