Look of h2 title pangea.org is broken

[nappex]

Page: https://riseup.net/en/security/resources/radical-servers

1. formatting of h2 title of pangea.org does not look as rest of titles on that page. Instead of h2 appearance, you will find raw text:

>>>>>>> refs/pullreqs/765
h2. pangea.org

2. pangea.org is missing in TOC of page
3. load page as https://riseup.net/en/security/resources/radical-servers#pangea or https://riseup.net/en/security/resources/radical-servers#pangeaorg does not work as user expect.

used browsers: Safari, Firefox
OS: macOS

Note:
I've tried to fix it, but source code on github looks fine see:

riseup_help/pages/security/resources/radical-servers/en.text

Line 281 in 6f3dcb2

h2. pangea.org

So maybe there is a problem when source code is generating to html. If you inspect the page, then you can see pangea is formatted as <p> html tag instead of <h2> tag.

[easingthemes]

It's a leftover from merge conflict. But I've checked all PR's around 765 and nothing.
Totally strange issue.

[taggart]

I tracked this down and cleaned it up. Thanks for the report!