fixed html indentation
fixed conflicts