added index.html
fixed conflicts