fix incorrect rebase