Merge from another branch to master branch