Squash and rebase