Create index.html
Resolve conflict