Fix merge conflicts

frontend/public/data/frequentConstants.ts

@@ -12,6 +12,7 @@ const integrationSlugNameMapping: Mapping = {
   'github': 'GitHub',
   'gitlab': 'GitLab',
   'render': 'Render',
+  'laravel-forge': "Laravel Forge",
   'railway': 'Railway',
   'flyio': 'Fly.io',
   'circleci': 'CircleCI',
@@ -19,7 +20,8 @@ const integrationSlugNameMapping: Mapping = {
   'supabase': 'Supabase',
   'checkly': 'Checkly',
   'hashicorp-vault': 'Vault',
-  'cloudflare-pages': 'Cloudflare Pages'
+  'cloudflare-pages': 'Cloudflare Pages',
+  'codefresh': 'Codefresh'
 }
 
 const envMapping: Mapping = {

frontend/public/locales/en/translations.json

@@ -251,6 +251,10 @@
     }
   },
   "settings": {
+    "webhooks": {
+      "title": "Webhooks",
+      "description": "Manage webhooks to setup deployment hooks for your various integrations."
+    },
     "members": {
       "title": "Project Members",
       "description": "This page shows the members of the selected project, and allows you to modify their permissions."