Revert "simplify conflict marker regex"
Revert "simplify conflict marker regex"

This reverts commit 0774c4b044769fae7cd05d5ea0a3354ae96368d5.

interferes with syntax highlighting markdown titles, e.g.

```markdown
big long title
==============
```

atweiden/macfiles