Fix merge conflicts

frontend/public/data/frequentConstants.ts

@@ -3,26 +3,30 @@ interface Mapping {
 }
 
 const integrationSlugNameMapping: Mapping = {
-  'azure-key-vault': 'Azure Key Vault',
-  'aws-parameter-store': 'AWS Parameter Store',
-  'aws-secret-manager': 'AWS Secret Manager',
-  'heroku': 'Heroku',
-  'vercel': 'Vercel',
-  'netlify': 'Netlify',
-  'github': 'GitHub',
-  'gitlab': 'GitLab',
-  'render': 'Render',
-  'laravel-forge': "Laravel Forge",
-  'railway': 'Railway',
-  'flyio': 'Fly.io',
-  'circleci': 'CircleCI',
-  'travisci': 'TravisCI',
-  'supabase': 'Supabase',
-  'checkly': 'Checkly',
+  "azure-key-vault": "Azure Key Vault",
+  "aws-parameter-store": "AWS Parameter Store",
+  "aws-secret-manager": "AWS Secret Manager",
+  heroku: "Heroku",
+  vercel: "Vercel",
+  netlify: "Netlify",
+  github: "GitHub",
+  gitlab: "GitLab",
+  render: "Render",
+  "laravel-forge": "Laravel Forge",
+  railway: "Railway",
+  flyio: "Fly.io",
+  circleci: "CircleCI",
+  travisci: "TravisCI",
+  supabase: "Supabase",
+  checkly: "Checkly",
   'terraform-cloud': 'Terraform Cloud',
-  'hashicorp-vault': 'Vault',
-  'cloudflare-pages': 'Cloudflare Pages'
-}
+  "hashicorp-vault": "Vault",
+  "cloudflare-pages": "Cloudflare Pages",
+  "codefresh": "Codefresh",
+  "digital-ocean-app-platform": "Digital Ocean App Platform",
+  bitbucket: "BitBucket",
+  "cloud-66": "Cloud 66"
+};
 
 const envMapping: Mapping = {
   Development: "dev",

frontend/public/locales/en/translations.json

@@ -227,7 +227,7 @@
     },
     "password": {
       "password": "Password",
-      "change": "Change password",
+      "change": "Change Password",
       "current": "Current password",
       "current-wrong": "The current password may be wrong",
       "new": "New password",
@@ -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."