no markdown
Merge pull request #9 from UCL/git3

Don't render markdown in conflict example