remove merge conflict marker
Merge pull request #1735 from mauk81/develop

remove merge conflict marker