rebase attempt