Fix merge conflicts

frontend/src/hooks/api/integrations/queries.tsx

@@ -61,6 +61,7 @@ export const useCreateIntegration = () => {
       metadata?: {
         secretPrefix?: string;
         secretSuffix?: string;
+        initialSyncBehavior?: string;
       }
     }) => {
       const { data: { integration } } = await apiRequest.post("/api/v1/integration", {

frontend/src/hooks/api/integrations/types.ts

@@ -24,10 +24,24 @@ export type TIntegration = {
   region?: string;
   scope?: string;
   integration: string;
-  metadata?: Record<string, any>;
   integrationAuthId: string;
   envId: string;
   secretPath: string;
   createdAt: string;
   updatedAt: string;
-};
+  __v: number;
+  metadata?: {
+    secretSuffix?: string;
+    syncBehavior?: IntegrationSyncBehavior;
+    scope: string;
+    org: string;
+    project: string;
+    environment: string;
+  };
+};
+
+export enum IntegrationSyncBehavior {
+  OVERWRITE_TARGET = "overwrite-target",
+  PREFER_TARGET = "prefer-target",
+  PREFER_SOURCE = "prefer-source"
+}