diff --git a/backend/src/variables/integration.ts b/backend/src/variables/integration.ts
index 5c26c8d86..ba3f0e905 100644
--- a/backend/src/variables/integration.ts
+++ b/backend/src/variables/integration.ts
@@ -22,11 +22,11 @@ export const INTEGRATION_FLYIO = "flyio";
 export const INTEGRATION_LARAVELFORGE = "laravel-forge"
 export const INTEGRATION_CIRCLECI = "circleci";
 export const INTEGRATION_TRAVISCI = "travisci";
-export const INTEGRATION_SUPABASE = 'supabase';
-export const INTEGRATION_CHECKLY = 'checkly';
-export const INTEGRATION_HASHICORP_VAULT = 'hashicorp-vault';
-export const INTEGRATION_CLOUDFLARE_PAGES = 'cloudflare-pages';
-export const INTEGRATION_CODEFRESH = 'codefresh';
+export const INTEGRATION_SUPABASE = "supabase";
+export const INTEGRATION_CHECKLY = "checkly";
+export const INTEGRATION_HASHICORP_VAULT = "hashicorp-vault";
+export const INTEGRATION_CLOUDFLARE_PAGES = "cloudflare-pages";
+export const INTEGRATION_CODEFRESH = "codefresh";
 export const INTEGRATION_SET = new Set([
     INTEGRATION_AZURE_KEY_VAULT,
   INTEGRATION_HEROKU,
@@ -69,11 +69,11 @@ export const INTEGRATION_RAILWAY_API_URL = "https://backboard.railway.app/graphq
 export const INTEGRATION_FLYIO_API_URL = "https://api.fly.io/graphql";
 export const INTEGRATION_CIRCLECI_API_URL = "https://circleci.com/api";
 export const INTEGRATION_TRAVISCI_API_URL = "https://api.travis-ci.com";
-export const INTEGRATION_SUPABASE_API_URL = 'https://api.supabase.com';
+export const INTEGRATION_SUPABASE_API_URL = "https://api.supabase.com";
 export const INTEGRATION_LARAVELFORGE_API_URL = "https://forge.laravel.com";
-export const INTEGRATION_CHECKLY_API_URL = 'https://api.checklyhq.com';
-export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = 'https://api.cloudflare.com';
-export const INTEGRATION_CODEFRESH_API_URL = 'https://g.codefresh.io/api';
+export const INTEGRATION_CHECKLY_API_URL = "https://api.checklyhq.com";
+export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = "https://api.cloudflare.com";
+export const INTEGRATION_CODEFRESH_API_URL = "https://g.codefresh.io/api";
 
 export const getIntegrationOptions = async () => {
     const INTEGRATION_OPTIONS = [
@@ -245,10 +245,9 @@ export const getIntegrationOptions = async () => {
             slug: "cloudflare-pages",
             image: "Cloudflare.png",
             isAvailable: true,
-<<<<<<< HEAD
-            type: 'pat',
-            clientId: '',
-            docsLink: ''
+            type: "pat",
+            clientId: "",
+            docsLink: ""
         },
         {
             name: "Codefresh",
@@ -259,12 +258,6 @@ export const getIntegrationOptions = async () => {
             clientId: "",
             docsLink: "",
         },
-=======
-            type: "pat",
-            clientId: "",
-            docsLink: ""
-        }
->>>>>>> origin
     ]
     
     return INTEGRATION_OPTIONS;