git merge master into feature branch