diff --git a/education/windows/index.md b/education/windows/index.md
index 5b5f054fdf..49ea89c1eb 100644
--- a/education/windows/index.md
+++ b/education/windows/index.md
@@ -37,22 +37,17 @@ author: CelesteDG
 <div class="side-by-side-content-right"><p><b>[Take tests in Windows 10](take-tests-in-windows-10.md)</b><br />Take a Test is a new app that lets you create the right environment for taking tests. Learn how to use and get it set up.</p>
 <p><b>[Chromebook migration guide](chromebook-migration-guide.md)</b><br />Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment.</p>
 
-## ![Deploy Windows 10 for education](images/PCicon.png) Deploy
+## ![Deploy Windows 10 for Education](images/PCicon.png) Deploy
 
 <p><b>[Set up Windows devices for education](set-up-windows-10.md)</b><br />Depending on your school's device management needs, you can use the Set up School PCs app or the Windows Configuration Designer tool to quickly set up student PCs.</p><p>
 <p><b>[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)</b><br />Get step-by-step guidance to help you deploy Windows 10 in a school environment.</p>
 <p><b>[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)</b><br />Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.</p>
 <p><b><a href="https://technet.microsoft.com/en-us/windows/mt574244" target="_blank">Try it out: Windows 10 deployment (for education)</a></b><br />Learn how to upgrade devices running the Windows 7 operating system to Windows 10 Anniversary Update, and how to manage devices, apps, and users in Windows 10 Anniversary Update.<br /><br />For the best experience, use this guide in tandem with the <a href="https://vlabs.holsystems.com/vlabs/technet?eng=VLabs&auth=none&src=vlabs&altadd=true&labid=20949&lod=true" target="_blank">TechNet Virtual Lab: IT Pro Try-It-Out</a>.</p>
 
-<<<<<<< HEAD
-### ![Upgrade to Windows 10 for education](images/windows.png) Switch
+### ![Switch to Windows 10 for Education](images/windows.png) Switch
 
-<p><b>[Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md)</b><br />If you have an education tenant and use Windows 10 Pro or Windows 10 S in your schools, find out how you can opt-in to a free switch to Windows 10 Pro Education.</p></div>
-=======
-## ![Upgrade to Windows 10 for education](images/windows.png) Upgrade
+<p><b>[Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md)</b><br />If you have an education tenant and use Windows 10 Pro or Windows 10 S in your schools, find out how you can opt-in to a free switch to Windows 10 Pro Education.</p>
 
-<p><b>[Switch Windows 10 Pro to Pro Education from Microsoft Store for Education](windows-10-pro-to-pro-edu-upgrade.md)</b><br />If you have an education tenant and use Windows 10 Pro in your schools now, find out how you can opt-in to a free switch to Windows 10 Pro Education.</p>
->>>>>>> f786f5b9a9068088c79f3774b5b3e6ba24a96c8c
 
 ## Windows 8.1
 
diff --git a/education/windows/switch-to-pro-education.md b/education/windows/switch-to-pro-education.md
index 94ef00d256..e5affe8444 100644
--- a/education/windows/switch-to-pro-education.md
+++ b/education/windows/switch-to-pro-education.md
@@ -1,7 +1,7 @@
 ---
 title: Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S
 description: Learn how IT Pros can opt into switching to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S.
-keywords: switch, Pro to Pro Education, S to Pro Education, education customers, Windows 10 Pro Education, Windows 10 Pro, Windows 10 S
+keywords: switch, free switch, Windows 10 Pro to Windows 10 Pro Education, Windows 10 S to Windows 10 Pro Education, education customers, Windows 10 Pro Education, Windows 10 Pro, Windows 10 S
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library