diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
index 21c02d6f4..b70f7b2ed 100644
--- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
+++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -119,6 +119,7 @@ var conflictStrings = []string{
 	"When you have resolved this problem",
 	"fix conflicts",
 	"Resolve all conflicts manually",
+	"Merge conflict in file",
 }
 
 func isMergeConflictErr(errStr string) bool {