From 80e366fdf6173313346785e39a48bef1ce36cce4 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 2 Mar 2026 10:33:04 -0800
Subject: [PATCH] Fix incorrect merge conflict

---
 src/components/input/FilterBar.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/input/FilterBar.tsx b/src/components/input/FilterBar.tsx
index cebfc057b..0823e4038 100644
--- a/src/components/input/FilterBar.tsx
+++ b/src/components/input/FilterBar.tsx
@@ -149,11 +149,15 @@ const FilterItem = ({ name, label, operator, value, onRemove }) => {
     >
       <Row alignItems="center" gap="4">
         <Row alignItems="center" gap="2" maxWidth={'500px'}>
-          <Text color="12" weight="bold">
+          <Text color="primary" weight="bold">
             {label}
           </Text>
-          <Text color="11">{operator}</Text>
-          <Text color="12" weight="bold" style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+          <Text color="muted">{operator}</Text>
+          <Text
+            color="primary"
+            weight="bold"
+            style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}
+          >
             {value}
           </Text>
         </Row>