removed merge conflict messages
Merge branch 'hotfix/v1.0.1'