git fetch upstream
git merge origin/master