chg user to branch
Merge origin/master