remove patch and rebase