Rebase and squash