address merge conflict

Author: VinnyBarton

tools.json

@@ -12908,6 +12908,74 @@
         "SCALA"
       ]
     },
+    {
+      "name": "Socket",
+      "publisher": "Socket",
+      "description": "Supply Chain Security platform. Next-gen SCA + SBOM + 0-day prevention.",
+      "website_url": "https://socket.dev",
+      "capabilities": [
+        "SBOM",
+        "VDR/VEX"
+      ],
+      "availability": [
+        "FREEMIUM",
+        "SUBSCRIPTION",
+        "COMMERCIAL_LICENSE"
+      ],
+      "functions": [
+        "ANALYSIS",
+        "AUTHOR",
+        "PACKAGE_MANAGER_INTEGRATION"
+      ],
+      "analysis": [
+        "SECURITY_VULNERABILITIES",
+        "POLICY_EVALUATION",
+        "LICENSE_REPORTING",
+        "OUTDATED_COMPONENTS"
+      ],
+      "transform": [],
+      "packaging": [
+        "APPLICATION",
+        "COMMAND_LINE_UTILITY",
+        "GITHUB_ACTION",
+        "GITHUB_APP",
+        "GITLAB_CI_TEMPLATE"
+      ],
+      "library": [],
+      "platform": [
+        "LINUX",
+        "MAC",
+        "WINDOWS"
+      ],
+      "lifecycle": [
+        "DESIGN",
+        "PRE-BUILD",
+        "BUILD",
+        "POST-BUILD"
+      ],
+      "supportedStandards": [
+        "CYCLONEDX",
+        "SPDX",
+        "PACKAGE_URL"
+      ],
+      "cycloneDxVersion": [],
+      "supportedLanguages": [
+        "C/C++",
+        ".NET",
+        "ERLANG_ELIXIR",
+        "GO",
+        "JAVA",
+        "JAVASCRIPT/TYPESCRIPT",
+        "KOTLIN",
+        "NODE.JS",
+        "PHP",
+        "PYTHON",
+        "RUBY",
+        "RUST",
+        "SCALA",
+        "SWIFT"
+      ]
+    },
     {
       "name": "SecureSBOM",
       "publisher": "ShiftLeftCyber",