merge newbranch into master