diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index c589137e73c5df2cc917959c3793999e8d05f78c..b5ac126a690ca2ba7023e526297f57302934bb4a 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -458,6 +458,7 @@ pub struct EntryStatus {
 pub struct GitProjectStatus {
     pub modified: Color,
     pub inserted: Color,
+    pub conflict: Color,
 }
 
 #[derive(Clone, Debug, Deserialize, Default)]
diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts
index 976cdede5cdab5f3760fd51a4343b04a771944b5..81dded151e54a091ac91ceba130c27449946594d 100644
--- a/styles/src/styleTree/projectPanel.ts
+++ b/styles/src/styleTree/projectPanel.ts
@@ -21,6 +21,9 @@ export default function projectPanel(colorScheme: ColorScheme) {
             inserted: isLight
                 ? colorScheme.ramps.green(0.4).hex()
                 : colorScheme.ramps.green(0.5).hex(),
+            conflict: isLight
+                    ? colorScheme.ramps.red(0.4).hex()
+                    : colorScheme.ramps.red(0.5).hex(),
         }
     }