removed merge conflict heads
Merge pull request #49 from eshem/master

removed merge conflict heads