git fetch upstream
git reset --hard upstream/master
git push origin master --force