rebase bug solved