fixed rebase bug