Duplicate </td> and double public_html_merged folder

[e2jk]

Isn't there an issue with the current state of the dev branch?
While wanting to create a PR because of a duplicate </td> in public_html/index.html (which had been introduced in commit c2e1c1f, particularly this line) I noticed that there are now 2 folders public_html and public_html_merged. Is that on purpose, or the issue of a merge command ?

This is the line I wanted to fix, but with that _merge folder I'm not sure my PR wouldn't just cause more trouble.

dump1090/public_html_merged/index.html

Line 206 in fe91fbc

</td>

[eric1tran]

Thanks, I've removed the extra tag.

The public_html_merged is intentional. This map contains all the new features and merges the 1090/978 aircraft together (previously we had separate dump1090-fa and skyaware978 maps at separate URLs). We plan to remove these in a future release as we move to one unified map.