removed merge conflict text
Merge pull request #129 from ODyckhoff/master

removed merge conflict text