git fetch upstream
git merge upstream/master