edits link

Author: tarTech23

articles/defender-for-iot/organizations/roles-on-premises.md

@@ -32,14 +32,9 @@ For more information, see:
 
 |Legacy scenario  |Description  |
 |---------|---------|
-<<<<<<< HEAD
 |**Sensor versions earlier than 23.2.0**     |   In sensor versions earlier than [23.2.0](release-notes-archive.md#default-privileged-user-is-now-admin-instead-of-support), the default *admin* user is named *support*. The *support* user is available and supported only on versions earlier than 23.2.0.<br><br>Documentation refers to the *admin* user to match the latest version of the software.      |
 |**Sensor software versions earlier than 23.1.x**     |   In sensor software versions earlier than [23.1.x](release-notes-archive.md#july-2023), the *cyberx* and *cyberx_host* privileged users are also in use. <br><br>In newly installed versions 23.1.x and higher, the *cyberx* and *cyberx_host* users are available, but not enabled by default. <br><br>To enable these extra privileged users, such as to use the [Defender for IoT CLI](references-work-with-defender-for-iot-cli-commands.md), change their passwords. For more information, see [Recover privileged access to a sensor](manage-users-sensor.md#recover-privileged-access-to-a-sensor).      |
 |**On-premises management consoles**     | The [on-premises management console](legacy-central-management/install-software-on-premises-management-console.md) is installed with privileged *support* and *cyberx* users. <br><br> When first setting up an on-premises management console, first sign in with the *support* user, create an initial user with an **Admin** role, and then use that admin user to create other users with other roles.        |
-=======
-|**Sensor versions earlier than 23.2.0**     |   In sensor versions earlier than [23.2.0](whats-new.md#default-privileged-user-is-now-admin-instead-of-support), the default *admin* user is named *support*. The *support* user is available and supported only on versions earlier than 23.2.0.<br><br>Documentation refers to the *admin* user to match the latest version of the software.      |
-|**Sensor software versions earlier than 23.1.x**     |   In sensor software versions earlier than [23.1.x](whats-new.md#july-2023), the *cyberx* and *cyberx_host* privileged users are also in use. <br><br>In newly installed versions 23.1.x and higher, the *cyberx* and *cyberx_host* users are available, but not enabled by default. <br><br>To enable these extra privileged users, such as to use the [Defender for IoT CLI](references-work-with-defender-for-iot-cli-commands.md), change their passwords. For more information, see [Recover privileged access to a sensor](manage-users-sensor.md#recover-privileged-access-to-a-sensor).      |
->>>>>>> da71d0c00f516cd88e673daf44a6fc3056a033de
 
 ### Access per privileged user
 

articles/defender-for-iot/organizations/update-ot-software.md

@@ -24,7 +24,6 @@ To perform the procedures described in this article, make sure that you have:
 
     |Update scenario  |Method details  |
     |---------|---------|
-    |**On-premises management console**     |  If the OT sensors you want to update are connected to an on-premises management console, plan to [update your on-premises management console](#update-the-on-premises-management-console) *before* updating your sensors.|
     |**Cloud-connected sensors**     |  Cloud connected sensors can be updated remotely, directly from the Azure portal, or manually using a downloaded update package.  <br><br>[Remote updates](#update-ot-sensors) require that your OT sensor has version [22.2.3](ot-sensor-archive.md#2223) or later already installed.       |
     |**Locally managed sensors**     |  Locally managed sensors can be updated using a downloaded update package, either via a connected on-premises management console, or directly on an OT sensor console. |