diff --git a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java
index 195bc006b4c0..4f0ab33ac16e 100644
--- a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java
+++ b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java
@@ -324,11 +324,11 @@ public class TextMergeChange extends ThreesideDiffChangeBase {
 
   @Nullable
   private GutterIconRenderer createResolveRenderer() {
-    if (!this.isConflict() || !myViewer.canApplyNonConflictedChange(this, ThreeSide.BASE)) return null;
+    if (!this.isConflict() || !myViewer.canResolveChangeAutomatically(this, ThreeSide.BASE)) return null;
 
     return createIconRenderer(DiffBundle.message("merge.dialog.resolve.change.action.name"), AllIcons.Diff.MagicResolve, false, () -> {
       myViewer.executeMergeCommand("Resolve conflict", Collections.singletonList(this), () -> {
-        myViewer.applyNonConflictedChange(this, ThreeSide.BASE);
+        myViewer.resolveChangeAutomatically(this, ThreeSide.BASE);
       });
     });
   }
diff --git a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
index c3b4f7a49ea0..d912705127a7 100644
--- a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
@@ -829,14 +829,14 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
     //
 
     private boolean hasNonConflictedChanges(@NotNull ThreeSide side) {
-      return ContainerUtil.exists(getAllChanges(), change -> canApplyNonConflictedChange(change, side));
+      return ContainerUtil.exists(getAllChanges(), change -> canResolveChangeAutomatically(change, side));
     }
 
     private void applyNonConflictedChanges(@NotNull ThreeSide side) {
       executeMergeCommand("Apply Non Conflicted Changes", true, null, () -> {
         List<TextMergeChange> allChanges = ContainerUtil.newArrayList(getAllChanges());
         for (TextMergeChange change : allChanges) {
-          applyNonConflictedChange(change, side);
+          resolveChangeAutomatically(change, side);
         }
       });
 
@@ -844,7 +844,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
       if (firstUnresolved != null) doScrollToChange(firstUnresolved, true);
     }
 
-    public boolean canApplyNonConflictedChange(@NotNull TextMergeChange change, @NotNull ThreeSide side) {
+    public boolean canResolveChangeAutomatically(@NotNull TextMergeChange change, @NotNull ThreeSide side) {
       if (change.isConflict()) {
         return side == ThreeSide.BASE &&
                change.getType().canBeResolved() &&
@@ -874,8 +874,8 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
       return !StringUtil.equals(baseContent, resultContent);
     }
 
-    public void applyNonConflictedChange(@NotNull TextMergeChange change, @NotNull ThreeSide side) {
-      if (!canApplyNonConflictedChange(change, side)) return;
+    public void resolveChangeAutomatically(@NotNull TextMergeChange change, @NotNull ThreeSide side) {
+      if (!canResolveChangeAutomatically(change, side)) return;
 
       if (change.isConflict()) {
         List<CharSequence> texts = ThreeSide.map(it -> {
@@ -1144,14 +1144,14 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
 
       @Override
       protected boolean isEnabled(@NotNull TextMergeChange change) {
-        return canApplyNonConflictedChange(change, ThreeSide.BASE);
+        return canResolveChangeAutomatically(change, ThreeSide.BASE);
       }
 
       @Override
       protected void apply(@NotNull ThreeSide side, @NotNull List<TextMergeChange> changes) {
         for (int i = changes.size() - 1; i >= 0; i--) {
           TextMergeChange change = changes.get(i);
-          applyNonConflictedChange(change, ThreeSide.BASE);
+          resolveChangeAutomatically(change, ThreeSide.BASE);
         }
       }
     }
diff --git a/platform/diff-impl/tests/com/intellij/diff/merge/MergeAutoTest.kt b/platform/diff-impl/tests/com/intellij/diff/merge/MergeAutoTest.kt
index b1742dbdd8bb..d81578b94c7e 100644
--- a/platform/diff-impl/tests/com/intellij/diff/merge/MergeAutoTest.kt
+++ b/platform/diff-impl/tests/com/intellij/diff/merge/MergeAutoTest.kt
@@ -82,7 +82,7 @@ class MergeAutoTest : MergeTestBase() {
     val index = RNG.nextInt(changes.size)
     val change = changes[index]
 
-    command(change) { viewer.applyNonConflictedChange(change, ThreeSide.BASE) }
+    command(change) { viewer.resolveChangeAutomatically(change, ThreeSide.BASE) }
   }
 
   private fun TestBuilder.doModifyText(): Unit {
diff --git a/platform/diff-impl/tests/com/intellij/diff/merge/MergeTestBase.kt b/platform/diff-impl/tests/com/intellij/diff/merge/MergeTestBase.kt
index 67c632976895..e218efedb92d 100644
--- a/platform/diff-impl/tests/com/intellij/diff/merge/MergeTestBase.kt
+++ b/platform/diff-impl/tests/com/intellij/diff/merge/MergeTestBase.kt
@@ -146,14 +146,14 @@ abstract class MergeTestBase : HeavyDiffTestCase() {
     fun Int.resolve() {
       val change = change(this)
       command(change) {
-        assertTrue(change.isConflict && viewer.canApplyNonConflictedChange(change, ThreeSide.BASE))
-        viewer.applyNonConflictedChange(change, ThreeSide.BASE)
+        assertTrue(change.isConflict && viewer.canResolveChangeAutomatically(change, ThreeSide.BASE))
+        viewer.resolveChangeAutomatically(change, ThreeSide.BASE)
       }
     }
 
     fun Int.canResolveConflict(): Boolean {
       val change = change(this)
-      return viewer.canApplyNonConflictedChange(change, ThreeSide.BASE)
+      return viewer.canResolveChangeAutomatically(change, ThreeSide.BASE)
     }
 
     //