Delete stashes conflicts