diff --git a/docs-data/rpk-overrides.json b/docs-data/rpk-overrides.json
index d226cc1525..ae0aa60aa1 100644
--- a/docs-data/rpk-overrides.json
+++ b/docs-data/rpk-overrides.json
@@ -3258,7 +3258,7 @@
       "description": "Stop a managed agent, setting its desired state to stopped."
     },
     "rpk ai llm-provider check": {
-      "description": "Run a lightweight probe against the configured LLM provider to verify credentials and reachability."
+      "introducedInVersion": "0.2.32"
     },
     "rpk ai agent credential create": {
       "description": "Create a client ID and secret pair for an agent. The client secret is shown once and cannot be retrieved again."
@@ -3485,11 +3485,8 @@
     },
     "rpk cluster brokers": {
       "pageAliases": "reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers.adoc",
-<<<<<<< HEAD
-      "introducedInVersion": "v26.2.1"
-=======
+      "introducedInVersion": "v26.2.1",
       "selfHostedOnly": true
->>>>>>> a8cf35b4 (Add selfHostedOnly overrides for cloud-unavailable rpk commands)
     },
     "rpk cluster brokers decommission": {
       "pageAliases": "reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc",
@@ -3505,11 +3502,8 @@
     },
     "rpk cluster loggers": {
       "pageAliases": "reference:rpk/rpk-redpanda/rpk-redpanda-admin-config-log-level.adoc",
-<<<<<<< HEAD
-      "introducedInVersion": "v26.2.1"
-=======
+      "introducedInVersion": "v26.2.1",
       "selfHostedOnly": true
->>>>>>> a8cf35b4 (Add selfHostedOnly overrides for cloud-unavailable rpk commands)
     },
     "rpk cluster loggers set": {
       "pageAliases": "reference:rpk/rpk-redpanda/rpk-redpanda-admin-config-log-level-set.adoc",
@@ -3570,7 +3564,6 @@
     },
     "rpk check install": {
       "description": "Install Redpanda Check.\n\nThis command installs the latest version by default.\n\nAlternatively, you may specify a version using the `--check-version` flag.\n\nYou may force the installation using the `--force` flag.",
-<<<<<<< HEAD
       "_note": "The source help text is missing a period after the summary sentence, which breaks the generated meta description.",
       "introducedInVersion": "v26.2.1"
     },
@@ -3580,9 +3573,6 @@
     "rpk ai llm-provider apply": {
       "introducedInVersion": "0.2.32"
     },
-    "rpk ai llm-provider check": {
-      "introducedInVersion": "0.2.32"
-    },
     "rpk ai llm-provider create": {
       "introducedInVersion": "0.2.32"
     },
@@ -3677,7 +3667,8 @@
       "introducedInVersion": "v26.2.1"
     },
     "rpk cluster upgrade": {
-      "introducedInVersion": "v26.2.1"
+      "introducedInVersion": "v26.2.1",
+      "selfHostedOnly": true
     },
     "rpk cluster upgrade finalize": {
       "introducedInVersion": "v26.2.1"
@@ -3750,14 +3741,6 @@
           "introducedInVersion": "v26.2.1"
         }
       }
-=======
-      "_note": "The source help text is missing a period after the summary sentence, which breaks the generated meta description."
-    },
-    "rpk cluster license": {
-      "selfHostedOnly": true
-    },
-    "rpk cluster upgrade": {
-      "selfHostedOnly": true
     },
     "rpk cluster config edit": {
       "selfHostedOnly": true
@@ -3765,18 +3748,20 @@
     "rpk cluster config export": {
       "selfHostedOnly": true
     },
-    "rpk transform pause": {
+    "rpk cluster license": {
       "selfHostedOnly": true
     },
-    "rpk transform resume": {
+    "rpk profile validate": {
       "selfHostedOnly": true
     },
     "rpk shadow config": {
       "selfHostedOnly": true
     },
-    "rpk profile validate": {
+    "rpk transform pause": {
+      "selfHostedOnly": true
+    },
+    "rpk transform resume": {
       "selfHostedOnly": true
->>>>>>> a8cf35b4 (Add selfHostedOnly overrides for cloud-unavailable rpk commands)
     }
   }
-}
\ No newline at end of file
+}