commit fo future resolve conflict2.
hotfix for master branch
commit after merge