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

src/services/api/flock.ts

@@ -1,22 +0,0 @@
-import {
-  CreateFlockPayload,
-  Flock,
-  UpdateFlockPayload,
-} from '@/types/api/master-data/flock';
-import {
-  CreateRecordingPayload,
-  Recording,
-  UpdateRecordingPayload,
-} from '@/types/api/flock/recording';
-import { BaseApiService } from '@/services/api/base';
-
-export const FlockApi = new BaseApiService<
-  Flock,
-  CreateFlockPayload,
-  UpdateFlockPayload
->('/flock/flocks');
-export const RecordingApi = new BaseApiService<
-  Recording,
-  CreateRecordingPayload,
-  UpdateRecordingPayload
->('/flock/recordings');

src/services/api/production.ts

@@ -4,9 +4,19 @@ import {
   ProjectFlock,
   UpdateProjectFlockPayload,
 } from '@/types/api/production/project-flock';
+import {
+  CreateRecordingPayload,
+  Recording,
+  UpdateRecordingPayload,
+} from '@/types/api/production/recording';
 
 export const ProjectFlockApi = new BaseApiService<
   ProjectFlock,
   CreateProjectFlockPayload,
   UpdateProjectFlockPayload
 >('/production/project_flocks');
+export const RecordingApi = new BaseApiService<
+  Recording,
+  CreateRecordingPayload,
+  UpdateRecordingPayload
+>('/flock/recordings');