revert and rebase