rebase the change into a single commit