Add conflict styles to project panel

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)]

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(),
         }
     }