diff --git a/windows/configuration/kiosk-methods.md b/windows/configuration/kiosk-methods.md
index da6e2cdceb..693a763c2b 100644
--- a/windows/configuration/kiosk-methods.md
+++ b/windows/configuration/kiosk-methods.md
@@ -7,7 +7,11 @@ 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