diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index a4f8caed29..19453e7cf9 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -19526,11 +19526,6 @@
      "redirect_document_id": true
     }, 
     { 
-<<<<<<< HEAD
-    
-=======
-     "source_path": "windows/client-management/mdm/proxy-csp.md",
->>>>>>> d376f1d90e9912f2a87b257188d9fbd56d3cc28d
      "source_path": "education/developers.yml",
      "redirect_url": "/education",
      "redirect_document_id": false
@@ -19542,10 +19537,6 @@
      },
      { 
       "source_path": "windows/client-management/mdm/policymanager-csp.md",
-<<<<<<< HEAD
-=======
-      "source_path": "windows/client-management/mdm/messaging-ddf.md",
->>>>>>> d376f1d90e9912f2a87b257188d9fbd56d3cc28d
       "redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
       "redirect_document_id": false
      },