Correcting stash conflicts