Fixes merge-conflict (stash/pop) mishap