diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/NoConflictChange.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/NoConflictChange.java
index 5ebbe9161a1c..9cd475765952 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/NoConflictChange.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/NoConflictChange.java
@@ -8,6 +8,8 @@ import org.jetbrains.annotations.NotNull;
 public class NoConflictChange extends TwoSideChange.SideChange<MergeNoConflict> {
   private static final Logger LOG = Logger.getInstance(NoConflictChange.class);
 
+  private boolean myApplied;
+
   public NoConflictChange(@NotNull MergeNoConflict twoSideChange,
                           @NotNull FragmentSide mergeSide,
                           @NotNull TextRange baseRange,
@@ -24,4 +26,12 @@ public class NoConflictChange extends TwoSideChange.SideChange<MergeNoConflict>
     LOG.assertTrue(otherChange != null, String.format("Other change is null. This change: %s Merge conflict: %s", this, myTwoSideChange));
     otherChange.markApplied();
   }
+
+  @Override
+  protected void markApplied() {
+    if (!myApplied) {
+      myApplied = true;
+      super.markApplied();
+    }
+  }
 }