fixes bug 1112932 - conflict markers in topchangers.html
Merge pull request #2520 from peterbe/bug-1112932-conflict-markers-in-topchangershtml

fixes bug 1112932 - conflict markers in topchangers.html