resolve conflict

Commands/connectedmachine/readme.md

@@ -22,9 +22,6 @@ Manage Azure Arc-Enabled Server.
 - [run-command](/Commands/connectedmachine/run-command/readme.md)
 : Manage run commands on an Azure Arc-Enabled Server.
 
-- [setting](/Commands/connectedmachine/setting/readme.md)
-: Manage Settings for Azure Arc-Enabled Server.
-
 ## Commands
 
 - [assess-patches](/Commands/connectedmachine/_assess-patches.md)

Commands/tree.json

@@ -19013,91 +19013,6 @@
               "connectedmachine",
               "run-command"
             ]
-          },
-          "setting": {
-            "commands": {
-              "create": {
-                "help": {
-                  "short": "Create the base Settings of the target resource."
-                },
-                "names": [
-                  "connectedmachine",
-                  "setting",
-                  "create"
-                ],
-                "versions": [
-                  {
-                    "name": "2024-05-20-preview",
-                    "resources": [
-                      {
-                        "id": "/subscriptions/{}/resourcegroups/{}/providers/{}/{}/{}/providers/microsoft.hybridcompute/settings/{}",
-                        "plane": "mgmt-plane",
-                        "version": "2024-05-20-preview"
-                      }
-                    ]
-                  }
-                ]
-              },
-              "show": {
-                "help": {
-                  "short": "Get the base Settings for the target resource."
-                },
-                "names": [
-                  "connectedmachine",
-                  "setting",
-                  "show"
-                ],
-                "versions": [
-                  {
-                    "name": "2024-05-20-preview",
-                    "resources": [
-                      {
-                        "id": "/subscriptions/{}/resourcegroups/{}/providers/{}/{}/{}/providers/microsoft.hybridcompute/settings/{}",
-                        "plane": "mgmt-plane",
-                        "version": "2024-05-20-preview"
-                      }
-                    ]
-                  }
-                ]
-              },
-              "update": {
-                "help": {
-                  "short": "Update the base Settings of the target resource."
-                },
-                "names": [
-                  "connectedmachine",
-                  "setting",
-                  "update"
-                ],
-                "versions": [
-                  {
-                    "examples": [
-                      {
-                        "commands": [
-                          "connectedmachine setting update --resource-group myResourceGroup --subscription mySubscription --base-provider Microsoft.HybridCompute --base-resource-type machines --base-resource-name workloadServer --settings-resource-name default --gateway-resource-id myResourceId"
-                        ],
-                        "name": "Sample command for setting update"
-                      }
-                    ],
-                    "name": "2024-05-20-preview",
-                    "resources": [
-                      {
-                        "id": "/subscriptions/{}/resourcegroups/{}/providers/{}/{}/{}/providers/microsoft.hybridcompute/settings/{}",
-                        "plane": "mgmt-plane",
-                        "version": "2024-05-20-preview"
-                      }
-                    ]
-                  }
-                ]
-              }
-            },
-            "help": {
-              "short": "Manage Settings for Azure Arc-Enabled Server."
-            },
-            "names": [
-              "connectedmachine",
-              "setting"
-            ]
           }
         },
         "commands": {