Rebase the patch