squash commits and rebase