fixed bug in rebase
unset upstream