updates html
fixed merge conflicts