fixed merge conflicts after merging to master branch