remove 1) remaining garbage from merges 2) closing divs/tags without opening tags

remove 1) unnecessary lines from previous merges (' <<<<<<< HEAD =======' and ' >>>>>>> 2fbddcb4507d634e9c8a21ea3ea9d9303bccbed4') and 2) closing html-tags without any opening tags.