fix(resolve): fix resolve conflict

src/config/constant.ts

@@ -13,23 +13,23 @@ export const MAIN_DRAWER_LINKS: MAIN_DRAWER_MENU[] = [
   },
 
   {
-    title: 'Flock',
-    link: '/flock',
-    icon: 'mdi:chicken',
+    title: 'Production',
+    link: '/production',
+    icon: 'material-symbols:conveyor-belt-outline-rounded',
     submenu: [
       {
         title: 'List Flock',
-        link: '/flock/list',
-        icon: 'mdi:chicken',
+        link: '/production/project-flock',
+        icon: 'material-symbols:list-alt-add-outline-rounded',
       },
       {
         title: 'Chick In',
-        link: '/flock/chick-in',
+        link: '/production/chick-in',
         icon: 'mdi:home-import-outline',
       },
       {
         title: 'Recording',
-        link: '/flock/recording',
+        link: '/production/recording',
         icon: 'mdi:clipboard-text',
       },
     ],
@@ -123,6 +123,11 @@ export const MAIN_DRAWER_LINKS: MAIN_DRAWER_MENU[] = [
         link: '/master-data/supplier',
         icon: 'material-symbols:add-business-outline-rounded',
       },
+      {
+        title: 'Flock',
+        link: '/master-data/flock',
+        icon: 'material-symbols:raven-outline-rounded',
+      },
     ],
   },
 ] as const;
@@ -183,6 +188,17 @@ export const CATEGORY_OPTIONS = [
   },
 ];
 
+export const FLOCK_CATEGORY_OPTIONS = [
+  {
+    label: 'GROWING',
+    value: 'GROWING',
+  },
+  {
+    label: 'LAYING',
+    value: 'LAYING',
+  },
+];
+
 export const PRODUCT_FLAG_OPTIONS = [
   { label: 'DOC', value: 'DOC' },
   { label: 'PAKAN', value: 'PAKAN' },