fixed a little rebase bug