Fix merge conflicts

backend/src/models/integrationAuth.ts

@@ -20,7 +20,8 @@ import {
   INTEGRATION_RENDER,
   INTEGRATION_SUPABASE,
   INTEGRATION_TRAVISCI,
-  INTEGRATION_VERCEL
+  INTEGRATION_VERCEL,
+  INTEGRATION_CODEFRESH
 } from "../variables";
 
 export interface IIntegrationAuth extends Document {
@@ -44,6 +45,7 @@ export interface IIntegrationAuth extends Document {
     | "aws-secret-manager"
     | "checkly"
     | "cloudflare-pages"
+    | "codefresh"
     | "bitbucket";
   teamId: string;
   accountId: string;
@@ -90,7 +92,8 @@ const integrationAuthSchema = new Schema<IIntegrationAuth>(
         INTEGRATION_SUPABASE,
         INTEGRATION_HASHICORP_VAULT,
         INTEGRATION_CLOUDFLARE_PAGES,
-        INTEGRATION_BITBUCKET
+        INTEGRATION_BITBUCKET,
+        INTEGRATION_CODEFRESH
       ],
       required: true,
     },