index conflict
fixed conflicts in index.html