fix conflicts

windows/deployment/update/feature-update-maintenance-window.md

@@ -8,7 +8,6 @@ itproauthor: jaimeo
 author: jaimeo
 ms.localizationpriority: medium
 ms.author: jaimeo
-ms.date: 07/09/2018
 ms.reviewer: 
 manager: laurawi
 ms.collection: M365-modern-desktop

windows/deployment/update/servicing-stack-updates.md

@@ -8,7 +8,6 @@ itproauthor: jaimeo
 author: jaimeo
 ms.localizationpriority: medium
 ms.author: jaimeo
-ms.date: 11/29/2018
 ms.reviewer: 
 manager: laurawi
 ms.collection: M365-modern-desktop

windows/deployment/update/waas-delivery-optimization.md

@@ -63,9 +63,9 @@ The following table lists the minimum Windows 10 version that supports Delivery
 
 
 
-By default in Windows 10 Enterprise and Education editions, Delivery Optimization allows peer-to-peer sharing on the organization's own network only (specifically, all of the devices must be behind the same NAT), but you can configure it differently in Group Policy and mobile device management (MDM) solutions such as Microsoft Intune.
+In Windows 10 Enterprise, Professional, and Education editions, Delivery Optimization is enabled by default for peer-to-peer sharing on the local network (NAT). Specifically, all of the devices must be behind the same NAT, but you can configure it differently in Group Policy and mobile device management (MDM) solutions such as Microsoft Intune.
 
-For more details, see "Download mode" in [Delivery optimization reference](waas-delivery-optimization-reference.md#download-mode).
+For more details, see "Download mode" in [Delivery optimization reference](waas-delivery-optimization-reference.md).
 
 
 ## Set up Delivery Optimization

windows/deployment/update/windows-update-troubleshooting.md

@@ -9,7 +9,6 @@ author: jaimeo
 ms.localizationprioauthor: jaimeo
 ms.audience: itpro
 author: jaimeo
-ms.date: 09/18/2018
 ms.reviewer: 
 manager: laurawi
 ms.topic: article