Fish Wang says to YSITD
git reser --hard upstream/master