Force your forked repo to be the same as upstream. Forces master changes into fork and throws away all changes!

fork forced sync

if no upstream remote created: git remote add upstream https://[upstream guy's repo url]
git fetch upstream
git reset --hard upstream/master
git push origin master --force