diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index d8ec3326d..7580c73c5 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 
 using Avalonia.Controls;
@@ -1870,7 +1871,11 @@ private void UpdateInProgressState()
 
         private async void StageChanges(List<Models.Change> changes, Models.Change next)
         {
-            var count = changes.Count;
+            var nonConflictChanges = HasUnsolvedConflicts
+                ? changes.Where(c => !c.IsConflicted).ToList()
+                : changes;
+
+            var count = nonConflictChanges.Count;
             if (count == 0)
                 return;
 
@@ -1890,7 +1895,7 @@ private async void StageChanges(List<Models.Change> changes, Models.Change next)
                 var pathSpecFile = Path.GetTempFileName();
                 await using (var writer = new StreamWriter(pathSpecFile))
                 {
-                    foreach (var c in changes)
+                    foreach (var c in nonConflictChanges)
                         await writer.WriteLineAsync(c.Path);
                 }
 
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
index ba7491411..8b9f90586 100644
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@@ -186,7 +186,10 @@ public Models.Change GetNextChangeWithoutSelection()
 
             var set = new HashSet<string>();
             foreach (var c in selected)
-                set.Add(c.Path);
+            {
+                if (!c.IsConflicted)
+                    set.Add(c.Path);
+            }
 
             if (Content is ViewModels.ChangeCollectionAsTree tree)
             {