Remove merge conflict markup

Resolves issue #6