Remove merge-markers from test.
Merge pull request #1192 from marcjansen/remove-parse-error

Remove merge-markers from test.