Renamed html to index.
Create index.html
Fixed merge.