fix(resolve): fix resolve mismatch conflict path on merge

src/components/pages/flock/recording/RecordingTable.tsx

@@ -22,7 +22,90 @@ const dummyRecordings: Recording[] = [
     id: 1,
     flock: {
       id: 1,
-      name: 'Flock A',
+      period: 1,
+      flock: {
+        id: 1,
+        name: 'Flock A',
+        created_at: '2024-01-01',
+        updated_at: '2024-01-01',
+        created_user: {
+          id: 1,
+          id_user: 1,
+          email: 'admin@example.com',
+          name: 'Admin',
+        },
+      },
+      area: {
+        id: 1,
+        name: 'Area 1',
+        created_at: '2024-01-01',
+        updated_at: '2024-01-01',
+        created_user: {
+          id: 1,
+          id_user: 1,
+          email: 'admin@example.com',
+          name: 'Admin',
+        },
+      },
+      fcr: {
+        id: 1,
+        name: 'FCR 1.5',
+        created_at: '2024-01-01',
+        updated_at: '2024-01-01',
+        created_user: {
+          id: 1,
+          id_user: 1,
+          email: 'admin@example.com',
+          name: 'Admin',
+        },
+      },
+      location: {
+        id: 1,
+        name: 'Location 1',
+        address: 'Address 1',
+        area: {
+          id: 1,
+          name: 'Area 1',
+        },
+        created_at: '2024-01-01',
+        updated_at: '2024-01-01',
+        created_user: {
+          id: 1,
+          id_user: 1,
+          email: 'admin@example.com',
+          name: 'Admin',
+        },
+      },
+      kandangs: [
+        {
+          id: 1,
+          name: 'Kandang 1',
+          status: 'ACTIVE',
+          location: {
+            id: 1,
+            name: 'Location 1',
+            address: 'Address 1',
+            area: {
+              id: 1,
+              name: 'Area 1',
+            },
+          },
+          pic: {
+            id: 1,
+            id_user: 1,
+            email: 'pic@example.com',
+            name: 'PIC User',
+          },
+          created_at: '2024-01-01',
+          updated_at: '2024-01-01',
+          created_user: {
+            id: 1,
+            id_user: 1,
+            email: 'admin@example.com',
+            name: 'Admin',
+          },
+        },
+      ],
       created_at: '2024-01-01',
       updated_at: '2024-01-01',
       created_user: {
@@ -53,6 +136,7 @@ const dummyRecordings: Recording[] = [
     coop: {
       id: 1,
       name: 'Coop 1',
+      status: 'ACTIVE',
       location: {
         id: 1,
         name: 'Location 1',
@@ -206,7 +290,9 @@ const RecordingTable = () => {
   const paginatedData = useMemo(() => {
     const filteredData = dummyRecordings.filter(
       (recording) =>
-        recording.flock.name.toLowerCase().includes(search.toLowerCase()) ||
+        recording.flock.flock.name
+          .toLowerCase()
+          .includes(search.toLowerCase()) ||
         recording.location.name.toLowerCase().includes(search.toLowerCase()) ||
         recording.coop.name.toLowerCase().includes(search.toLowerCase())
     );
@@ -253,7 +339,7 @@ const RecordingTable = () => {
       <div className='flex flex-col gap-2 mb-4'>
         <TableToolbar
           addButton={{
-            href: '/flock/recording/add',
+            href: 'recording/add',
             label: 'Tambah Recording',
           }}
           search={{
@@ -382,7 +468,7 @@ const RecordingTable = () => {
             cell: (props) => pageSize * (page - 1) + props.row.index + 1,
           },
           {
-            accessorKey: 'flock.name',
+            accessorKey: 'flock.flock.name',
             header: 'Flock',
           },
           {