removed conflicts
Merge pull request #1589 from shivalinga/dev-branch

removed conflicts