Fixed redirects

Author: Michael Bender

.openpublishing.redirection.json

@@ -4971,7 +4971,6 @@
             "redirect_document_id": false
         },
         {
-<<<<<<< HEAD
             "source_path_from_root": "/articles/virtual-network/ip-services/tutorial-cross-region-cli.md",
             "redirect_url": "/azure/virtual-network/ip-services/tutorial-cross-region-portal.md",
             "redirect_document_id": false
@@ -4980,11 +4979,11 @@
             "source_path_from_root": "/articles/virtual-network/ip-services/tutorial-cross-region-powershell.md",
             "redirect_url": "/azure/virtual-network/ip-services/tutorial-cross-region-portal.md",
             "redirect_document_id": false
-        }        
-=======
-          "source_path_from_root":"/articles/container-registry/manual-regional-move.md",
-          "redirect_url":"/azure/operational-excellence/relocation-container-registry",
-          "redirect_document_id":false
+        },
+        {
+            "source_path_from_root":"/articles/container-registry/manual-regional-move.md",
+            "redirect_url": "/azure/operational-excellence/relocation-container-registry",
+            "redirect_document_id":false
         },
         {
             "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell.md",
@@ -4995,8 +4994,7 @@
             "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-cli.md",
             "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
             "redirect_document_id": false
-        }  
->>>>>>> 4701e084e9cfa013ff1b21197328c2c70821f2b0
+        }
 
     ]
 }