Merge pull request #678 from anthropics/claude/merge-pr-669-d73N4

Resolve merge conflict in add-plugin/intercom vs staging

.claude-plugin/marketplace.json

@@ -594,9 +594,9 @@
       "category": "deployment",
       "source": {
         "source": "url",
-        "url": "https://github.com/vercel/vercel-deploy-claude-code-plugin.git"
+        "url": "https://github.com/vercel/vercel-plugin.git"
       },
-      "homepage": "https://github.com/vercel/vercel-deploy-claude-code-plugin"
+      "homepage": "https://github.com/vercel/vercel-plugin"
     },
     {
       "name": "stripe",
@@ -709,8 +709,7 @@
       "category": "development",
       "source": {
         "source": "url",
-        "url": "https://github.com/qodo-ai/qodo-skills.git",
-        "sha": "623eb4ed4364d8111f9a9132a791d7497d814b6a"
+        "url": "https://github.com/qodo-ai/qodo-skills.git"
       },
       "homepage": "https://github.com/qodo-ai/qodo-skills.git"
     },
@@ -1015,6 +1014,30 @@
         "url": "https://github.com/MicrosoftDocs/mcp.git"
       },
       "homepage": "https://github.com/microsoftdocs/mcp"
+    },
+    {
+      "name": "neon",
+      "description": "Manage your Neon projects and databases with the neon-postgres agent skill and the Neon MCP Server.",
+      "category": "database",
+      "source": {
+        "source": "git-subdir",
+        "url": "neondatabase/agent-skills",
+        "path": "plugins/neon-postgres",
+        "ref": "main",
+        "sha": "54d7a9db2ddd476f84d5d1fd7bac323907858a8b"
+      },
+      "homepage": "https://github.com/neondatabase/agent-skills/tree/main/plugins/neon-postgres"
+    },
+    {
+      "name": "intercom",
+      "description": "Intercom integration for Claude Code. Search conversations, analyze customer support patterns, look up contacts and companies, and install the Intercom Messenger. Connect your Intercom workspace to get real-time insights from customer data.",
+      "category": "productivity",
+      "source": {
+        "source": "url",
+        "url": "https://github.com/intercom/claude-plugin-external.git",
+        "sha": "eeef353eead2e3dc5f33f64dbaae54e1309e0d45"
+      },
+      "homepage": "https://github.com/intercom/claude-plugin-external"
     }
   ]
 }