diff --git a/website/content/api-docs/acl/auth-methods.mdx b/website/content/api-docs/acl/auth-methods.mdx
index e68364db1..8409ae2ac 100644
--- a/website/content/api-docs/acl/auth-methods.mdx
+++ b/website/content/api-docs/acl/auth-methods.mdx
@@ -34,7 +34,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl auth-method create`](https://www.consul.io/commands/acl/auth-method/create).
+=======
+-> The corresponding CLI command is [`consul acl auth-method create`](https://www.consul.io/commands/acl/auth-method/create)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -162,7 +166,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl auth-method read`](https://www.consul.io/commands/acl/auth-method/read).
+=======
+-> The corresponding CLI command is [`consul acl auth-method read`](https://www.consul.io/commands/acl/auth-method/read)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -216,7 +224,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl auth-method update`](https://www.consul.io/commands/acl/auth-method/update).
+=======
+-> The corresponding CLI command is [`consul acl auth-method update`](https://www.consul.io/commands/acl/auth-method/update)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -349,7 +361,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl auth-method delete`](/commands/acl/auth-method/delete).
+=======
+-> The corresponding CLI command is [`consul acl auth-method delete`](https://www.consul.io/commands/acl/auth-method/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -393,7 +409,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl auth-method list`](https://www.consul.io/commands/acl/auth-method/list).
+=======
+-> The corresponding CLI command is [`consul acl auth-method list`](https://www.consul.io/commands/acl/auth-method/list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/acl/binding-rules.mdx b/website/content/api-docs/acl/binding-rules.mdx
index ca3365f57..f5c3d9bee 100644
--- a/website/content/api-docs/acl/binding-rules.mdx
+++ b/website/content/api-docs/acl/binding-rules.mdx
@@ -34,7 +34,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl binding-rule create`](/commands/acl/binding-rule/create).
+=======
+-> The corresponding CLI command is [`consul acl binding-rule create`](https://www.consul.io/commands/acl/binding-rule/create)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -160,7 +164,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl binding-rule read`](/commands/acl/binding-rule/read).
+=======
+-> The corresponding CLI command is [`consul acl binding-rule read`](https://www.consul.io/commands/acl/binding-rule/read)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -212,7 +220,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl binding-rule update`](/commands/acl/binding-rule/update).
+=======
+-> The corresponding CLI command is [`consul acl binding-rule update`](https://www.consul.io/commands/acl/binding-rule/update)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -344,7 +356,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl binding-rule delete`](/commands/acl/binding-rule/delete).
+=======
+-> The corresponding CLI command is [`consul acl binding-rule delete`](https://www.consul.io/commands/acl/binding-rule/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -388,7 +404,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl binding-rule list`](/commands/acl/binding-rule/list).
+=======
+-> The corresponding CLI command is [`consul acl binding-rule list`](https://www.consul.io/commands/acl/binding-rule/list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ## Parameters
 
diff --git a/website/content/api-docs/acl/index.mdx b/website/content/api-docs/acl/index.mdx
index 879f90ce1..963b66d74 100644
--- a/website/content/api-docs/acl/index.mdx
+++ b/website/content/api-docs/acl/index.mdx
@@ -38,7 +38,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `none`       |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl bootstrap`](/commands/acl/bootstrap).
+=======
+-> The corresponding CLI command is [`consul acl bootstrap`](https://www.consul.io/commands/acl/bootstrap)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
@@ -204,7 +208,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl translate-rules`](/commands/acl/translate-rules).
+=======
+-> The corresponding CLI command is [`consul acl translate-rules`](https://www.consul.io/commands/acl/translate-rules)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Payload
 
@@ -253,7 +261,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl translate-rules`](/commands/acl/translate-rules).
+=======
+-> The corresponding CLI command is [`consul acl translate-rules`](https://www.consul.io/commands/acl/translate-rules)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
@@ -296,7 +308,11 @@ enabled. Login requires the ability to create local tokens which is restricted
 to the primary datacenter and any secondary datacenters with ACL token
 replication enabled.
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul login`](/commands/login).
+=======
+-> The corresponding CLI command is [`consul login`](https://www.consul.io/commands/login)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -384,7 +400,11 @@ The table below shows this endpoint's support for
 -> **Note** - This endpoint requires no specific privileges as it is just
 deleting a token for which you already must possess its secret.
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul logout`](/commands/logout).
+=======
+-> The corresponding CLI command is [`consul logout`](https://www.consul.io/commands/logout)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
diff --git a/website/content/api-docs/acl/policies.mdx b/website/content/api-docs/acl/policies.mdx
index 6c9edf95a..c68798380 100644
--- a/website/content/api-docs/acl/policies.mdx
+++ b/website/content/api-docs/acl/policies.mdx
@@ -33,7 +33,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl policy create`](/commands/acl/policy/create).
+=======
+-> The corresponding CLI command is [`consul acl policy create`](https://www.consul.io/commands/acl/policy/create)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -108,7 +112,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl policy read`](/commands/acl/policy/read).
+=======
+-> The corresponding CLI command is [`consul acl policy read`](https://www.consul.io/commands/acl/policy/read)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -160,7 +168,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl policy read -name=<string>`](/commands/acl/policy/read#name).
+=======
+-> The corresponding CLI command is [`consul acl policy read -name=<string>`](https://www.consul.io/commands/acl/policy/read#name)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -212,7 +224,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl policy update`](/commands/acl/policy/update).
+=======
+-> The corresponding CLI command is [`consul acl policy update`](https://www.consul.io/commands/acl/policy/update)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -293,7 +309,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl policy delete`](/commands/acl/policy/delete).
+=======
+-> The corresponding CLI command is [`consul acl policy delete`](https://www.consul.io/commands/acl/policy/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -337,7 +357,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl policy list`](/commands/acl/policy/list).
+=======
+-> The corresponding CLI command is [`consul acl policy list`](https://www.consul.io/commands/acl/policy/list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/acl/roles.mdx b/website/content/api-docs/acl/roles.mdx
index 099d12da0..cab0ad1c1 100644
--- a/website/content/api-docs/acl/roles.mdx
+++ b/website/content/api-docs/acl/roles.mdx
@@ -32,7 +32,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl role create`](/commands/acl/role/create).
+=======
+-> The corresponding CLI command is [`consul acl role create`](https://www.consul.io/commands/acl/role/create)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -174,7 +178,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl role read`](/commands/acl/role/read).
+=======
+-> The corresponding CLI command is [`consul acl role read`](https://www.consul.io/commands/acl/role/read)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -246,7 +254,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl role read -name=<string>`](/commands/acl/role/read#name).
+=======
+-> The corresponding CLI command is [`consul acl role read -name=<string>`](https://www.consul.io/commands/acl/role/read#name)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -317,7 +329,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl role update`](/commands/acl/role/update).
+=======
+-> The corresponding CLI command is [`consul acl role update`](https://www.consul.io/commands/acl/role/update)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -435,7 +451,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl role delete`](/commands/acl/role/delete).
+=======
+-> The corresponding CLI command is [`consul acl role delete`](https://www.consul.io/commands/acl/role/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -479,7 +499,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl role list`](/commands/acl/role/list).
+=======
+-> The corresponding CLI command is [`consul acl role list`](https://www.consul.io/commands/acl/role/list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ## Parameters
 
diff --git a/website/content/api-docs/acl/tokens.mdx b/website/content/api-docs/acl/tokens.mdx
index af158127c..b3f0f2f5c 100644
--- a/website/content/api-docs/acl/tokens.mdx
+++ b/website/content/api-docs/acl/tokens.mdx
@@ -32,7 +32,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl token create`](/commands/acl/token/create).
+=======
+-> The corresponding CLI command is [`consul acl token create`](https://www.consul.io/commands/acl/token/create)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -175,7 +179,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl token read`](/commands/acl/token/read).
+=======
+-> The corresponding CLI command is [`consul acl token read`](https://www.consul.io/commands/acl/token/read)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -247,7 +255,11 @@ The table below shows this endpoint's support for
 -> **Note** - This endpoint requires no specific privileges as it is just
 retrieving the data for a token that you must already possess its secret.
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl token read -self`](/commands/acl/token/read#self).
+=======
+-> The corresponding CLI command is [`consul acl token read -self`](https://www.consul.io/commands/acl/token/read#self)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
@@ -299,7 +311,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl token update`](/commands/acl/token/update).
+=======
+-> The corresponding CLI command is [`consul acl token update`](https://www.consul.io/commands/acl/token/update)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -449,7 +465,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl token clone`](/commands/acl/token/clone).
+=======
+-> The corresponding CLI command is [`consul acl token clone`](https://www.consul.io/commands/acl/token/clone)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -530,7 +550,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `acl:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl token delete`](/commands/acl/token/delete).
+=======
+-> The corresponding CLI command is [`consul acl token delete`](https://www.consul.io/commands/acl/token/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -574,7 +598,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `acl:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl token list`](/commands/acl/token/list).
+=======
+-> The corresponding CLI command is [`consul acl token list`](https://www.consul.io/commands/acl/token/list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ## Parameters
 
diff --git a/website/content/api-docs/agent/index.mdx b/website/content/api-docs/agent/index.mdx
index b472c6782..5fd0fba7d 100644
--- a/website/content/api-docs/agent/index.mdx
+++ b/website/content/api-docs/agent/index.mdx
@@ -227,7 +227,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `node:read`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul members`](/commands/members).
+=======
+-> The corresponding CLI command is [`consul members`](https://www.consul.io/commands/members)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -375,7 +379,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------- |
 | `NO`             | `none`            | `none`        | `agent:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul reload`](/commands/reload).
+=======
+-> The corresponding CLI command is [`consul reload`](https://www.consul.io/commands/reload)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
@@ -408,7 +416,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `node:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul maint`](/commands/maint).
+=======
+-> The corresponding CLI command is [`consul maint`](https://www.consul.io/commands/maint)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -635,7 +647,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------- |
 | `NO`             | `none`            | `none`        | `agent:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul join`](/commands/join).
+=======
+-> The corresponding CLI command is [`consul join`](https://www.consul.io/commands/join)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -677,7 +693,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------- |
 | `NO`             | `none`            | `none`        | `agent:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul leave`](/commands/leave).
+=======
+-> The corresponding CLI command is [`consul leave`](https://www.consul.io/commands/leave)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
@@ -716,7 +736,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul force-leave`](/commands/force-leave).
+=======
+-> The corresponding CLI command is [`consul force-leave`](https://www.consul.io/commands/force-leave)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -792,7 +816,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------- |
 | `NO`             | `none`            | `none`        | `agent:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul acl set-agent-token`](/commands/acl/set-agent-token).
+=======
+-> The corresponding CLI command is [`consul acl set-agent-token`](https://www.consul.io/commands/acl/set-agent-token)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/agent/service.mdx b/website/content/api-docs/agent/service.mdx
index 8c37c7d1a..9abec0fa0 100644
--- a/website/content/api-docs/agent/service.mdx
+++ b/website/content/api-docs/agent/service.mdx
@@ -593,7 +593,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `NO`             | `none`            | `none`        | `service:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul services register`](/commands/services/register).
+=======
+-> The corresponding CLI command is [`consul services register`](https://www.consul.io/commands/services/register)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Query string parameters
 
@@ -768,7 +772,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `NO`             | `none`            | `none`        | `service:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul services deregister`](/commands/services/deregister).
+=======
+-> The corresponding CLI command is [`consul services deregister`](https://www.consul.io/commands/services/deregister)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/catalog.mdx b/website/content/api-docs/catalog.mdx
index e685ce9fb..5a48e23dd 100644
--- a/website/content/api-docs/catalog.mdx
+++ b/website/content/api-docs/catalog.mdx
@@ -266,7 +266,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `none`       |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul catalog datacenters`](/commands/catalog/datacenters).
+=======
+-> The corresponding CLI command is [`consul catalog datacenters`](https://www.consul.io/commands/catalog/datacenters)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
@@ -299,7 +303,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `node:read`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul catalog nodes`](/commands/catalog/nodes).
+=======
+-> The corresponding CLI command is [`consul catalog nodes`](https://www.consul.io/commands/catalog/nodes)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -396,7 +404,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | -------------- |
 | `YES`            | `all`             | `none`        | `service:read` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul catalog services`](/commands/catalog/services).
+=======
+-> The corresponding CLI command is [`consul catalog services`](https://www.consul.io/commands/catalog/services)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/config.mdx b/website/content/api-docs/config.mdx
index 24d386283..e2a5707c2 100644
--- a/website/content/api-docs/config.mdx
+++ b/website/content/api-docs/config.mdx
@@ -48,7 +48,11 @@ The table below shows this endpoint's support for
 | service-splitter    | `service:write`    |
 | terminating-gateway | `operator:write`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul config write`](/commands/config/write).
+=======
+-> The corresponding CLI command is [`consul config write`](https://www.consul.io/commands/config/write)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -117,7 +121,11 @@ The table below shows this endpoint's support for
 | service-splitter    | `service:read`    |
 | terminating-gateway | `service:read`    |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul config read`](/commands/config/read).
+=======
+-> The corresponding CLI command is [`consul config read`](https://www.consul.io/commands/config/read)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -188,7 +196,11 @@ The table below shows this endpoint's support for
 | service-splitter    | `service:read`    |
 | terminating-gateway | `service:read`    |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul config list`](/commands/config/list).
+=======
+-> The corresponding CLI command is [`consul config list`](https://www.consul.io/commands/config/list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -264,7 +276,11 @@ The table below shows this endpoint's support for
 | service-splitter    | `service:write`    |
 | terminating-gateway | `operator:write `  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul config delete`](/commands/config/delete).
+=======
+-> The corresponding CLI command is [`consul config delete`](https://www.consul.io/commands/config/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/connect/ca.mdx b/website/content/api-docs/connect/ca.mdx
index 4804d362b..ccad2a488 100644
--- a/website/content/api-docs/connect/ca.mdx
+++ b/website/content/api-docs/connect/ca.mdx
@@ -125,7 +125,11 @@ The table below shows this endpoint's support for
 <sup>1</sup> ACL required was <code>operator:read</code> prior to versions 1.8.6,
 1.7.10, and 1.6.10.
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul connect ca get-config`](/commands/connect/ca#get-config).
+=======
+-> The corresponding CLI command is [`consul connect ca get-config`](https://www.consul.io/commands/connect/ca#get-config)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
@@ -167,7 +171,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul connect ca set-config`](/commands/connect/ca#set-config).
+=======
+-> The corresponding CLI command is [`consul connect ca set-config`](https://www.consul.io/commands/connect/ca#set-config)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/connect/intentions.mdx b/website/content/api-docs/connect/intentions.mdx
index 5a93e7583..1401b8a8f 100644
--- a/website/content/api-docs/connect/intentions.mdx
+++ b/website/content/api-docs/connect/intentions.mdx
@@ -54,7 +54,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention create -replace`](/commands/intention/create#replace).
+=======
+-> The corresponding CLI command is [`consul intention create -replace`](https://www.consul.io/commands/intention/create#replace)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### URL Parameters
 
@@ -165,7 +169,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention create`](/commands/intention/create).
+=======
+-> The corresponding CLI command is [`consul intention create`](https://www.consul.io/commands/intention/create)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### URL Parameters
 
@@ -319,7 +327,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention create`](/commands/intention/get).
+=======
+-> The corresponding CLI command is [`consul intention create`](https://www.consul.io/commands/intention/get)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -396,7 +408,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention create`](/commands/intention/get).
+=======
+-> The corresponding CLI command is [`consul intention create`](https://www.consul.io/commands/intention/get)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -458,7 +474,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention create`](/commands/intention/get).
+=======
+-> The corresponding CLI command is [`consul intention create`](https://www.consul.io/commands/intention/get)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -549,7 +569,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention delete`](/commands/intention/delete).
+=======
+-> The corresponding CLI command is [`consul intention delete`](https://www.consul.io/commands/intention/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -609,7 +633,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention delete`](/commands/intention/delete).
+=======
+-> The corresponding CLI command is [`consul intention delete`](https://www.consul.io/commands/intention/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -666,7 +694,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention check`](/commands/intention/check).
+=======
+-> The corresponding CLI command is [`consul intention check`](https://www.consul.io/commands/intention/check)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -731,7 +763,11 @@ The table below shows this endpoint's support for
   for more details.
 </p>
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul intention match`](/commands/intention/match).
+=======
+-> The corresponding CLI command is [`consul intention match`](https://www.consul.io/commands/intention/match)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/coordinate.mdx b/website/content/api-docs/coordinate.mdx
index dc53ba358..c51dc0bd1 100644
--- a/website/content/api-docs/coordinate.mdx
+++ b/website/content/api-docs/coordinate.mdx
@@ -38,7 +38,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `none`       |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul rtt -wan #`](/commands/rtt#wan).
+=======
+-> The corresponding CLI command is [`consul rtt -wan #`](https://www.consul.io/commands/rtt#wan)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
@@ -92,7 +96,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `node:read`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul rtt #`](/commands/rtt).
+=======
+-> The corresponding CLI command is [`consul rtt #`](https://www.consul.io/commands/rtt)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/event.mdx b/website/content/api-docs/event.mdx
index fd835a097..e72c5aab4 100644
--- a/website/content/api-docs/event.mdx
+++ b/website/content/api-docs/event.mdx
@@ -29,7 +29,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------- |
 | `NO`             | `none`            | `none`        | `event:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul event`](/commands/event).
+=======
+-> The corresponding CLI command is [`consul event`](https://www.consul.io/commands/event)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/kv.mdx b/website/content/api-docs/kv.mdx
index 63e62060e..70a533c85 100644
--- a/website/content/api-docs/kv.mdx
+++ b/website/content/api-docs/kv.mdx
@@ -41,7 +41,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `YES`            | `all`             | `none`        | `key:read`   |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul kv get`](/commands/kv/get).
+=======
+-> The corresponding CLI command is [`consul kv get`](https://www.consul.io/commands/kv/get)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -173,7 +177,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `key:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul kv put`](/commands/kv/put).
+=======
+-> The corresponding CLI command is [`consul kv put`](https://www.consul.io/commands/kv/put)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -261,7 +269,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `key:write`  |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul kv delete`](/commands/kv/delete).
+=======
+-> The corresponding CLI command is [`consul kv delete`](https://www.consul.io/commands/kv/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/namespaces.mdx b/website/content/api-docs/namespaces.mdx
index 1d3b49871..6660a7b8f 100644
--- a/website/content/api-docs/namespaces.mdx
+++ b/website/content/api-docs/namespaces.mdx
@@ -29,7 +29,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul namespace create`](/commands/namespace/create).
+=======
+-> The corresponding CLI command is [`consul namespace create`](https://www.consul.io/commands/namespace/create)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -163,7 +167,11 @@ The table below shows this endpoint's support for
 <sup>1</sup> Access can be granted to list the Namespace if the token used when making
 the request has been granted any access in the namespace (read, list or write).
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul namespace read`](/commands/namespace/read).
+=======
+-> The corresponding CLI command is [`consul namespace read`](https://www.consul.io/commands/namespace/read)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -231,7 +239,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul namespace update`](/commands/namespace/update) or [`consul namespace write`](/commands/namespace/write).
+=======
+-> The corresponding CLI command is [`consul namespace update`](https://www.consul.io/commands/namespace/update) or [`consul namespace write`](https://www.consul.io/commands/namespace/write)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -370,7 +382,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul namespace delete`](/commands/namespace/delete).
+=======
+-> The corresponding CLI command is [`consul namespace delete`](https://www.consul.io/commands/namespace/delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -444,7 +460,11 @@ The table below shows this endpoint's support for
 <sup>1</sup> Access can be granted to list the Namespace if the token used when making
 the request has been granted any access in the namespace (read, list or write).
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul namespace list`](/commands/namespace/list).
+=======
+-> The corresponding CLI command is [`consul namespace list`](https://www.consul.io/commands/namespace/list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Sample Request
 
diff --git a/website/content/api-docs/operator/area.mdx b/website/content/api-docs/operator/area.mdx
index e28fe41f0..cb7afed1f 100644
--- a/website/content/api-docs/operator/area.mdx
+++ b/website/content/api-docs/operator/area.mdx
@@ -45,7 +45,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator area create`](/commands/operator/area#create).
+=======
+-> The corresponding CLI command is [`consul operator area create`](https://www.consul.io/commands/operator/area#create)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -113,7 +117,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `YES`            | `all`             | `none`        | `operator:read` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator area list`](/commands/operator/area#list).
+=======
+-> The corresponding CLI command is [`consul operator area list`](https://www.consul.io/commands/operator/area#list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -158,7 +166,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator area update`](/commands/operator/area#update).
+=======
+-> The corresponding CLI command is [`consul operator area update`](https://www.consul.io/commands/operator/area#update)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -250,7 +262,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator area delete`](/commands/operator/area#delete).
+=======
+-> The corresponding CLI command is [`consul operator area delete`](https://www.consul.io/commands/operator/area#delete)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -288,7 +304,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator area join`](/commands/operator/area#join).
+=======
+-> The corresponding CLI command is [`consul operator area join`](https://www.consul.io/commands/operator/area#join)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -363,7 +383,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `NO`             | `none`            | `none`        | `operator:read` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator area members`](/commands/operator/area#members).
+=======
+-> The corresponding CLI command is [`consul operator area members`](https://www.consul.io/commands/operator/area#members)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/operator/autopilot.mdx b/website/content/api-docs/operator/autopilot.mdx
index 749e795f6..15d2738fa 100644
--- a/website/content/api-docs/operator/autopilot.mdx
+++ b/website/content/api-docs/operator/autopilot.mdx
@@ -33,7 +33,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `NO`             | `none`            | `none`        | `operator:read` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator autopilot get-config`](/commands/operator/autopilot#get-config).
+=======
+-> The corresponding CLI command is [`consul operator autopilot get-config`](https://www.consul.io/commands/operator/autopilot#get-config)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -89,7 +93,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator autopilot set-config`](/commands/operator/autopilot#set-config).
+=======
+-> The corresponding CLI command is [`consul operator autopilot set-config`](https://www.consul.io/commands/operator/autopilot#set-config)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -273,7 +281,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `NO`             | `none`            | `none`        | `operator:read` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator autopilot state`](/commands/operator/autopilot#state).
+=======
+-> The corresponding CLI command is [`consul operator autopilot state`](https://www.consul.io/commands/operator/autopilot#state)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/operator/keyring.mdx b/website/content/api-docs/operator/keyring.mdx
index b0dfef608..de8f37b15 100644
--- a/website/content/api-docs/operator/keyring.mdx
+++ b/website/content/api-docs/operator/keyring.mdx
@@ -35,7 +35,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | -------------- |
 | `NO`             | `none`            | `none`        | `keyring:read` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul keyring -list`](/commands/keyring#list).
+=======
+-> The corresponding CLI command is [`consul keyring -list`](https://www.consul.io/commands/keyring#list)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -122,7 +126,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `NO`             | `none`            | `none`        | `keyring:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul keyring -intstall`](/commands/keyring#install).
+=======
+-> The corresponding CLI command is [`consul keyring -intstall`](https://www.consul.io/commands/keyring#install)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -170,7 +178,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `NO`             | `none`            | `none`        | `keyring:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul keyring -use`](/commands/keyring#use).
+=======
+-> The corresponding CLI command is [`consul keyring -use`](https://www.consul.io/commands/keyring#use)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -218,7 +230,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | --------------- |
 | `NO`             | `none`            | `none`        | `keyring:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul keyring -remove`](/commands/keyring#remove).
+=======
+-> The corresponding CLI command is [`consul keyring -remove`](https://www.consul.io/commands/keyring#remove)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/operator/license.mdx b/website/content/api-docs/operator/license.mdx
index b4853ad1c..7766393b0 100644
--- a/website/content/api-docs/operator/license.mdx
+++ b/website/content/api-docs/operator/license.mdx
@@ -31,7 +31,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `all`             | `none`        | `none`       |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul license get`](/commands/license#get).
+=======
+-> The corresponding CLI command is [`consul license get`](https://www.consul.io/commands/license#get)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -98,7 +102,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul license put`](/commands/license#put).
+=======
+-> The corresponding CLI command is [`consul license put`](https://www.consul.io/commands/license#put)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -170,7 +178,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul license reset`](/commands/license#reset).
+=======
+-> The corresponding CLI command is [`consul license reset`](https://www.consul.io/commands/license#reset)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/operator/raft.mdx b/website/content/api-docs/operator/raft.mdx
index 3bd4dc4b8..4bd375447 100644
--- a/website/content/api-docs/operator/raft.mdx
+++ b/website/content/api-docs/operator/raft.mdx
@@ -130,7 +130,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ---------------- |
 | `NO`             | `none`            | `none`        | `operator:write` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator raft remove-peer`](/commands/operator/raft#remove-peer).
+=======
+-> The corresponding CLI command is [`consul operator raft remove-peer`](https://www.consul.io/commands/operator/raft#remove-peer)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/snapshot.mdx b/website/content/api-docs/snapshot.mdx
index b2866eae3..2556ab134 100644
--- a/website/content/api-docs/snapshot.mdx
+++ b/website/content/api-docs/snapshot.mdx
@@ -39,7 +39,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `default,stale`   | `none`        | `management` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul snapshot save`](/commands/snapshot/save).
+=======
+-> The corresponding CLI command is [`consul snapshot save`](https://www.consul.io/commands/snapshot/save)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
@@ -96,7 +100,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `management` |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul snapshot restore`](/commands/snapshot/restore).
+=======
+-> The corresponding CLI command is [`consul snapshot restore`](https://www.consul.io/commands/snapshot/restore)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters
 
diff --git a/website/content/api-docs/status.mdx b/website/content/api-docs/status.mdx
index 39df6eeca..3bff750ae 100644
--- a/website/content/api-docs/status.mdx
+++ b/website/content/api-docs/status.mdx
@@ -70,7 +70,11 @@ The table below shows this endpoint's support for
 | ---------------- | ----------------- | ------------- | ------------ |
 | `NO`             | `none`            | `none`        | `none`       |
 
+<<<<<<< HEAD
 -> The corresponding CLI command is [`consul operator raft list-peers`](/commands/operator/raft#list-peers).
+=======
+-> The corresponding CLI command is [`consul operator raft list-peers`](https://www.consul.io/commands/operator/raft#list-peers)
+>>>>>>> f3587417d0a80537b28263338c32bfd840714733
 
 ### Parameters