git checkout master
git fetch origin master
git merge yourbranch

fix the conflicts
git add mychangedfile.txt

git push origin master