From e9619ec1ac5904bc63e2ccf6ba5ab3517d6545b2 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charles@twenty.com>
Date: Mon, 14 Aug 2023 19:35:09 -0700
Subject: [PATCH] Fix merge conflict

---
 .../modules/ui/table/table-header/components/TableHeader.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/modules/ui/table/table-header/components/TableHeader.tsx b/front/src/modules/ui/table/table-header/components/TableHeader.tsx
index e698e3546..dd0eff9c1 100644
--- a/front/src/modules/ui/table/table-header/components/TableHeader.tsx
+++ b/front/src/modules/ui/table/table-header/components/TableHeader.tsx
@@ -81,7 +81,7 @@ export function TableHeader<SortField>({
             isPrimaryButton
           />
           <SortDropdownButton<SortField>
-            context={TableContext}
+            context={TableRecoilScopeContext}
             isSortSelected={sorts.length > 0}
             availableSorts={availableSorts || []}
             onSortSelect={sortSelect}