:wq
fixed conflicts
Updating index.html