diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index dd28bdd73e..22b6b3fd75 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -1086,7 +1086,7 @@ impl ProjectPanel {
             .map(|status| match status {
                 GitFileStatus::Added => style.status.git.inserted,
                 GitFileStatus::Modified => style.status.git.modified,
-                GitFileStatus::Conflict => style.text.color,
+                GitFileStatus::Conflict => style.status.git.conflict,
             })
             .unwrap_or(style.text.color);