Delete index.html
Create index.html
Update index.html
Update style.css
Update index.html
fix merge conflict