clean up previous rebase/merge failures before applying patches.