diff --git a/src/ViewModels/MergeConflictEditor.cs b/src/ViewModels/MergeConflictEditor.cs
index 5c739ae23..fc9d0f632 100644
--- a/src/ViewModels/MergeConflictEditor.cs
+++ b/src/ViewModels/MergeConflictEditor.cs
@@ -190,6 +190,9 @@ public async Task<bool> SaveAndStageAsync()
             for (var j = lastLineIdx; j < lines.Length; j++)
                 builder.Append(lines[j]).Append('\n');
 
+            if (builder.Length > 1)
+                builder.Length--; // Remove extra '\n'
+
             try
             {
                 // Write merged content to file