rebase?

like this?