diff --git a/pkg/result/processors/fixer.go b/pkg/result/processors/fixer.go
index ce33b27fb276..0422b0622716 100644
--- a/pkg/result/processors/fixer.go
+++ b/pkg/result/processors/fixer.go
@@ -301,6 +301,10 @@ func diff3Conflict(path, xlabel, ylabel string, xedits, yedits []diff.Edit) erro
 		return err
 	}
 
-	return fmt.Errorf("conflicting edits from %s and %s on %s\nfirst edits:\n%s\nsecond edits:\n%s",
-		xlabel, ylabel, path, xdiff, ydiff)
+	from := xlabel
+	if from != ylabel {
+		from += " and " + ylabel
+	}
+	return fmt.Errorf("conflicting edits from %s on %s\nfirst edits:\n%s\nsecond edits:\n%s",
+		from, path, xdiff, ydiff)
 }