merge changes from my branch to the master branch