ok, there is something wrong in my local branch. Even when I go back to the original state (before rebase) by `git reset --hard HEAD@{xx}`, there seem to be some weird changes that don't quite reflect what's supposed to be there. I didn't make much changes in my last commit, so I don't mind losing it for now. My local realtime branch is just too messed up. I think it's best if I don't push anything. You can go ahead with your rebase with the current upstream branch.