From 5fa25efaa2edf2d59e87a6acfa7a8904c36b02f7 Mon Sep 17 00:00:00 2001
From: Heidi Lohr <helohr@microsoft.com>
Date: Thu, 13 Sep 2018 10:02:09 -0700
Subject: [PATCH] Updated change history table

---
 ...ew-in-windows-mdm-enrollment-management.md | 30 +++----------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
index b3972d76d7..3fe0514881 100644
--- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
@@ -1760,34 +1760,12 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
 
 ## Change history in MDM documentation
 
-<<<<<<< HEAD
-## September 2018
-
-<table class="mx-tdBreakAll">
-<colgroup>
-<col width="25%" />
-<col width="75%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>New or updated topic</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td style="vertical-align:top">[Policy CSP - DeviceGuard](policy-csp-deviceguard.md)</td>
-<td style="vertical-align:top"><p>Updated ConfigureSystemGuardLaunch policy and replaced EnableSystemGuard with it.</p>
-</td></tr>
-</tbody>
-</table>
-=======
 ### September 2018
 
-New or updated topic | Description
---- | ---
-[Mobile device management](index.md#mmat) | Added information about the MDM Migration Analysis Tool (MMAT).
->>>>>>> master
+|New or updated topic | Description|
+|--- | ---|
+|[Mobile device management](index.md#mmat) | Added information about the MDM Migration Analysis Tool (MMAT).|
+|[Policy CSP - DeviceGuard](policy-csp-deviceguard.md) | Updated ConfigureSystemGuardLaunch policy and replaced EnableSystemGuard with it.|
 
 ### August 2018