diff --git a/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java b/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
index 3f42006cd2b7..0d551e4d4ee2 100644
--- a/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
+++ b/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
@@ -79,21 +79,12 @@ public class GitStashChangesSaver extends GitChangesSaver {
   }
 
   public void load() throws VcsException {
-    Collection<VirtualFile> conflictedRoots = new ArrayList<VirtualFile>();
     for (VirtualFile root : myStashedRoots) {
-      boolean conflict = loadRoot(root);
-      if (conflict) {
-        conflictedRoots.add(root);
-      }
+      loadRoot(root);
     }
 
     boolean conflictsResolved = new UnstashConflictResolver(myProject, myGit, myStashedRoots, myParams).merge();
-    if (conflictsResolved) {
-      LOG.info("load: all conflicts resolved, dropping stash in " + myStashedRoots);
-      for (VirtualFile root : conflictedRoots) {
-        GitStashUtils.dropStash(myProject, root);
-      }
-    }
+    LOG.info("load: conflicts resolved status is " + conflictsResolved + " in roots " + myStashedRoots);
   }
 
   @Override
diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
index 960621269f9d..1b6dedcd5916 100644
--- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
@@ -414,10 +414,7 @@ public class GitUnstashDialog extends DialogWrapper {
     if (conflict.get()) {
       VirtualFile root = d.getGitRoot();
       boolean conflictsResolved = new UnstashConflictResolver(project, root, d.getSelectedStash()).merge();
-      if (conflictsResolved) {
-        LOG.info("loadRoot " + root + " conflicts resolved, dropping stash");
-        GitStashUtils.dropStash(project, root);
-      }
+      LOG.info("loadRoot " + root + ", conflictsResolved: " + conflictsResolved);
     } else if (rc != 0) {
       GitUIUtil.showOperationErrors(project, h.errors(), h.printableCommandLine());
     }