Fix merge conflicts

backend/src/models/integration.ts

@@ -19,6 +19,7 @@ import {
   INTEGRATION_SUPABASE,
   INTEGRATION_TRAVISCI,
   INTEGRATION_VERCEL,
+  INTEGRATION_CODEFRESH
 } from "../variables";
 
 export interface IIntegration {
@@ -56,7 +57,8 @@ export interface IIntegration {
     | "checkly"
     | "hashicorp-vault"
     | "cloudflare-pages"
-    | "bitbucket";
+    | "bitbucket"
+    | "codefresh"
   integrationAuth: Types.ObjectId;
 }
 
@@ -147,6 +149,7 @@ const integrationSchema = new Schema<IIntegration>(
         INTEGRATION_HASHICORP_VAULT,
         INTEGRATION_CLOUDFLARE_PAGES,
         INTEGRATION_BITBUCKET,
+        INTEGRATION_CODEFRESH
       ],
       required: true,
     },