diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index 9aa556ed4..0e78f3f6b 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -156,7 +156,7 @@ func (c *GitCommand) GetStatusFiles() []*File {
 			HasUnstagedChanges: unstagedChange != " ",
 			Tracked:            !untracked,
 			Deleted:            unstagedChange == "D" || stagedChange == "D",
-			HasMergeConflicts:  change == "UU" || change == "AA",
+			HasMergeConflicts:  change == "UU" || change == "AA" || change == "DU",
 			Type:               c.OSCommand.FileType(filename),
 		}
 		files = append(files, file)