diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md
index 473cec1c54..ccd2dc173a 100644
--- a/education/windows/use-set-up-school-pcs-app.md
+++ b/education/windows/use-set-up-school-pcs-app.md
@@ -29,7 +29,7 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
 - Gives a friendly and unique name to each student device for future management
 - Sets Microsoft-recommended school PC settings, including shared PC mode which provides faster sign-in and automatic account cleanup
 - Enables optional guest account for younger students, lost passwords, or visitors
-- Enables optional secure testing account
+- Enables optional secure testing account
 - Enables optional Windows Automatic Redeployment feature to return devices to a fully configured or known IT-approved state
 - Locks down the student PC to prevent mischievous activity:
     * Prevents students from removing the PC from the school's device management system
@@ -183,7 +183,7 @@ The **Set up School PCs** app guides you through the configuration choices for t
 
     If you select this option, this adds a **Guest** account button in the PC's sign-in screen to allow anyone to use the PC.
  
-  - Select **Enable Windows Automatic Redeployment** to reset student PCs from the lock screen any time and apply original settings and device management enrollment (AAD & MDM) so they’re ready to use. Make sure you are running Windows 10, version 1709 on the student PCs if you want to use Windows Automatic Redeployment through the Set up School PCs app.
+  - Select **Enable Windows Automatic Redeployment** to reset student PCs from the lock screen any time and apply original settings and device management enrollment (Azure AD and MDM) so they’re ready to use. Make sure you are running Windows 10, version 1709 on the student PCs if you want to use Windows Automatic Redeployment through the Set up School PCs app.
   - To change the default lock screen background or to use your school's custom lock screen background, click **Browse** to select a new lock screen background.
 
     **Figure 4** - Configure student PC settings
diff --git a/education/windows/windows-automatic-redeployment.md b/education/windows/windows-automatic-redeployment.md
index ea5ccb3ab4..cbeaace1d6 100644
--- a/education/windows/windows-automatic-redeployment.md
+++ b/education/windows/windows-automatic-redeployment.md
@@ -46,17 +46,11 @@ You can set the policy using one of these methods:
 - Set up School PCs app
 
     Windows Automatic Redeployment in the Set up School PCs app is available in the latest release of the app. Make sure you are running Windows 10, version 1709 on the student PCs if you want to use Windows Automatic Redeployment through the Set up School PCs app. You can check the version several ways:
-<<<<<<< HEAD
-
-To use the Windows Automatic Redeployment setting in the Set up School PCs app:
-
-=======
     - Reach out to your device manufacturer.
     - If you manage your PCs using Intune or Intune for Education, you can check the OS version by checking the **OS version** info for the device. If  you are using another MDM provider, check the documentation for the MDM provider to confirm the OS version.
     - Log into the PCs, go to the **Settings > System > About** page, look in the **Windows specifications** section and confirm **Version** is set to 1709.
 
     To use the Windows Automatic Redeployment setting in the Set up School PCs app:
->>>>>>> refs/remotes/origin/master
     * When using [Set up School PCs](use-set-up-school-pcs-app.md), in the **Configure student PC settings** screen, select **Enable Windows 10 Automatic Redeployment** among the list of settings for the student PC as shown in the following example:
 
     ![Configure student PC settings in Set up School PCs](images/suspc_configure_pc2.jpg)