diff --git a/README.md b/README.md
index fa13a55593..8864d2a10e 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ Welcome! This repository houses the docs that are written for IT professionals f
 - [Surface](https://technet.microsoft.com/itpro/surface)
 - [Surface Hub](https://technet.microsoft.com/itpro/surface-hub)
 - [Windows 10 for Education](https://technet.microsoft.com/edu/windows)
+- [HoloLens](https://technet.microsoft.com/itpro/hololens)
 - [Microsoft Desktop Optimization Pack](https://technet.microsoft.com/itpro/mdop) 
 
 ## Contributing
diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md
index 89487d41ca..26af07a521 100644
--- a/windows/manage/change-history-for-manage-and-update-windows-10.md
+++ b/windows/manage/change-history-for-manage-and-update-windows-10.md
@@ -15,7 +15,6 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
 >If you're looking for **update history** for Windows 10, see [Windows 10 and Windows Server 2016 update history](https://support.microsoft.com/help/12387/windows-10-update-history).
 
 ## January 2017
-<<<<<<< HEAD
 
 | New or changed topic | Description |
 | --- | --- |