diff --git a/pkg/gui/mergeconflicts/rendering.go b/pkg/gui/mergeconflicts/rendering.go
index e57754e4b..c71c12d37 100644
--- a/pkg/gui/mergeconflicts/rendering.go
+++ b/pkg/gui/mergeconflicts/rendering.go
@@ -24,7 +24,8 @@ func ColoredConflictFile(state *State) string {
 		if i == conflict.end && len(remainingConflicts) > 0 {
 			conflict, remainingConflicts = shiftConflict(remainingConflicts)
 		}
-		outputBuffer.WriteString(textStyle.Sprint(line) + "\n")
+		outputBuffer.WriteString(textStyle.Sprint(line))
+		outputBuffer.WriteByte('\n')
 	}
 	return outputBuffer.String()
 }