rebase problem