change master before merging a branch