Created by: FlowerWrong
Add rebase to upstream/master git rebase upstream/master
git rebase upstream/master