fix merge conflict

Author: Michael Bender

.openpublishing.redirection.json

@@ -4951,23 +4951,23 @@
             "redirect_document_id": false
         },
         {
-<<<<<<< HEAD
             "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-cli.md",
             "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-portal",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-powershell.md",
             "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-portal",
-=======
+            "redirect_document_id": false
+        },
+        {
             "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-powershell.md",
             "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-cli.md",
             "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
->>>>>>> dfbe00b09073dde6df8268f9a365befd388766b5
             "redirect_document_id": false
         }
 

articles/virtual-network/ip-services/create-custom-ip-address-prefix-portal.md

@@ -7,7 +7,7 @@ ms.author: mbender
 ms.service: virtual-network
 ms.subservice: ip-services
 ms.topic: how-to
-ms.date: 07/25/2024
+maims.date: 07/25/2024
 ---
 
 # Create a custom IPv4 address prefix using the Azure portal