init
change index to html
Fix conflicts automerge