clean rebase attempt