modify on dev granch
modify on master branch
conflict fixed