changed html file
fixed conflicts