remove remaining garbage from merges and closing divs/tags without opening tags

I saw some errors and took the liberty of fixing them.

1) There were some lines from merges remaining, I removed them
2) There were some closing html-tags without any opening tags - I removed them as well, since it looks like they weren't needed anyways.