Stash pop conflicts