diff --git a/devices/surface-hub/TOC.md b/devices/surface-hub/TOC.md
index 2ede04e84b..660faffe89 100644
--- a/devices/surface-hub/TOC.md
+++ b/devices/surface-hub/TOC.md
@@ -1,46 +1,5 @@
 # [Microsoft Surface Hub](index.md)
-<<<<<<< HEAD
 ## [What's new in Windows 10, version 1703 for Surface Hub?](surfacehub-whats-new-1703.md)
-=======
-## [Microsoft Surface Hub administrator's guide](surface-hub-administrators-guide.md)
-### [Intro to Microsoft Surface Hub](intro-to-surface-hub.md)
-### [Prepare your environment for Microsoft Surface Hub](prepare-your-environment-for-surface-hub.md)
-#### [Physically install Microsoft Surface Hub](physically-install-your-surface-hub-device.md)
-#### [Create and test a device account](create-and-test-a-device-account-surface-hub.md)
-##### [Online deployment](online-deployment-surface-hub-device-accounts.md)
-##### [On-premises deployment (single forest)](on-premises-deployment-surface-hub-device-accounts.md)
-##### [On-premises deployment (multiple forests)](on-premises-deployment-surface-hub-multi-forest.md)
-##### [Hybrid deployment](hybrid-deployment-surface-hub-device-accounts.md)
-##### [Create a device account using UI](create-a-device-account-using-office-365.md)
-##### [Microsoft Exchange properties](exchange-properties-for-surface-hub-device-accounts.md)
-##### [Applying ActiveSync policies to device accounts](apply-activesync-policies-for-surface-hub-device-accounts.md)
-##### [Password management](password-management-for-surface-hub-device-accounts.md)
-#### [Create provisioning packages](provisioning-packages-for-certificates-surface-hub.md)
-#### [Admin group management](admin-group-management-for-surface-hub.md)
-### [Set up Microsoft Surface Hub](set-up-your-surface-hub.md)
-#### [Setup worksheet](setup-worksheet-surface-hub.md)
-#### [First-run program](first-run-program-surface-hub.md)
-### [Manage Microsoft Surface Hub](manage-surface-hub.md)
-#### [Remote Surface Hub management](remote-surface-hub-management.md)
-##### [Manage settings with an MDM provider](manage-settings-with-mdm-for-surface-hub.md)
-##### [Monitor your Surface Hub](monitor-surface-hub.md)
-##### [Windows updates](manage-windows-updates-for-surface-hub.md)
-#### [Manage Surface Hub settings](manage-surface-hub-settings.md)
-##### [Local management for Surface Hub settings](local-management-surface-hub-settings.md)
-##### [Accessibility](accessibility-surface-hub.md)
-##### [Change the Surface Hub device account](change-surface-hub-device-account.md)
-##### [Device reset](device-reset-surface-hub.md)
-##### [Use fully qualified domain name with Surface Hub](use-fully-qualified-domain-name-surface-hub.md)
-##### [Wireless network management](wireless-network-management-for-surface-hub.md)
-#### [Install apps on your Surface Hub](install-apps-on-surface-hub.md)
-#### [End a Surface Hub meeting with I'm Done](i-am-done-finishing-your-surface-hub-meeting.md)
-#### [Save your BitLocker key](save-bitlocker-key-surface-hub.md)
-#### [Connect other devices and display with Surface Hub](connect-and-display-with-surface-hub.md)
-#### [Using a room control system](use-room-control-system-with-surface-hub.md)
-### [Troubleshoot Microsoft Surface Hub](troubleshoot-surface-hub.md)
-### [Appendix: PowerShell](appendix-a-powershell-scripts-for-surface-hub.md)
-## [Useful downloads for Surface Hub administrators](surface-hub-downloads.md)
->>>>>>> refs/remotes/origin/master
 ## [Differences between Surface Hub and Windows 10 Enterprise](differences-between-surface-hub-and-windows-10-enterprise.md)
 ## [Prepare your environment for Microsoft Surface Hub](prepare-your-environment-for-surface-hub.md)
 ### [Physically install Microsoft Surface Hub](physically-install-your-surface-hub-device.md)