fixed a rebase issue