diff --git a/‎src/ViewModels/MergeConflictEditor.cs‎
Lines changed: 3 additions & 0 deletions b/‎src/ViewModels/MergeConflictEditor.cs‎
Lines changed: 3 additions & 0 deletions
@@ -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
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,9 @@ public async Task<bool> SaveAndStageAsync()`
`190`	`190`	`for (var j = lastLineIdx; j < lines.Length; j++)`
`191`	`191`	`builder.Append(lines[j]).Append('\n');`
`192`	`192`
	`193`	`+ if (builder.Length > 1)`
	`194`	`+ builder.Length--; // Remove extra '\n'`
	`195`	`+`
`193`	`196`	`try`
`194`	`197`	`{`
`195`	`198`	`// Write merged content to file`