Added some boilerplate html
Fix merge conflict