fixed merge conflict with master branch