update branch with commits to master