Remove merge-markers from test.

This removes a `SyntaxError` in `tests/Filter/Comparison.html`.

This test now passes for me again.

Please review.