diff --git a/windows/configuration/kiosk-methods.md b/windows/configuration/kiosk-methods.md
index 693a763c2b..e0121dbd6c 100644
--- a/windows/configuration/kiosk-methods.md
+++ b/windows/configuration/kiosk-methods.md
@@ -7,11 +7,6 @@ ms.sitesec: library
 ms.pagetype: security
 ms.localizationpriority: medium
 author: jdeckerms
-<<<<<<< HEAD
-ms.date: 01/08/2019
-=======
-ms.date: 01/09/2019
->>>>>>> origin/master
 ---
 
 # Configure kiosks and digital signs on Windows desktop editions
diff --git a/windows/configuration/kiosk-prepare.md b/windows/configuration/kiosk-prepare.md
index 4cef49132c..16050b1a6c 100644
--- a/windows/configuration/kiosk-prepare.md
+++ b/windows/configuration/kiosk-prepare.md
@@ -28,6 +28,7 @@ ms.date: 01/09/2019
 >
 >Kiosk mode is not supported over a remote desktop connection. Your kiosk users must sign in on the physical device that is set up as a kiosk.
 
+## Configuration recommendations
 
 For a more secure kiosk experience, we recommend that you make the following configuration changes to the device before you configure it as a kiosk:
 
@@ -235,5 +236,7 @@ The following table describes some features that have interoperability issues we
 </table>
 
 
+## Testing your kiosk in a virtual machine (VM)
+