docs(DLB): update

bare-metal/elastic-metal/api-cli/elastic-metal-with-api.mdx

@@ -27,11 +27,7 @@ The new deployment in one command feature allows you to speed up the delivery of
 
 ## Deploying Elastic Metal servers using the API
 
-<<<<<<< HEAD
-Besides creating your Elastic Metal servers from the graphical [Scaleway console](/bare-metal/elastic-metal/how-to/create-server/), you can also create and manage them directly from the command line using the [CLI-tool](https://github.com/scaleway/scaleway-cli/) or the [API](https://www.scaleway.com/en/developers/api/elastic-metal/).
-=======
-Besides creating your Elastic Metal servers from the graphical [Scaleway console](/bare-metal/elastic-metal/how-to/create-server), you can also create and manage them directly from the command line using the [CLI-tool](https://github.com/scaleway/scaleway-cli) or the [API](https://www.scaleway.com/en/developers/api/elastic-metal/).
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+Besides creating your Elastic Metal servers from the graphical [Scaleway console](/bare-metal/elastic-metal/how-to/create-server/), you can also create and manage them directly from the command line using the [CLI-tool](https://github.com/scaleway/scaleway-cli) or the [API](https://www.scaleway.com/en/developers/api/elastic-metal/).
 
 <Message type="note">
   You need to [generate API keys](/identity-and-access-management/iam/how-to/create-api-keys/) to access the Scaleway API.

compute/instances/api-cli/creating-managing-instances-with-cliv2.mdx

@@ -13,11 +13,7 @@ categories:
   - compute
 ---
 
-<<<<<<< HEAD
-Scaleway Instances provide you with resources to develop, test code and deploy your applications in no time. Instances are designed for modern workflows. They are with you from prototyping to large-scale deployment. You can [create](/compute/instances/how-to/create-an-instance/) and manage your Instances from the [console](https://console.scaleway.com/login/), via the [API](https://www.scaleway.com/en/developers/api/instance/) or the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli/).
-=======
-Scaleway Instances provide you with resources to develop, test code and deploy your applications in no time. Instances are designed for modern workflows. They are with you from prototyping to large-scale deployment. You can [create](/compute/instances/how-to/create-an-instance) and manage your Instances from the [console](https://console.scaleway.com/login), via the [API](https://www.scaleway.com/en/developers/api/instance/) or the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli).
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+Scaleway Instances provide you with resources to develop, test code and deploy your applications in no time. Instances are designed for modern workflows. They are with you from prototyping to large-scale deployment. You can [create](/compute/instances/how-to/create-an-instance/) and manage your Instances from the [console](https://console.scaleway.com/login), via the [API](https://www.scaleway.com/en/developers/api/instance/) or the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli).
 
 ## Scaleway Command Line Interface Overview
 

compute/instances/how-to/create-a-snapshot.mdx

@@ -58,11 +58,7 @@ You can create a [volume](/compute/instances/concepts/#volume) from a snapshot a
       The available volume types may change according to the type of snapshot you select.
     </Message>
 
-<<<<<<< HEAD
-    The volume is created, and can be viewed in the [Volumes tab](https://console.scaleway.com/instance/volumes/). Check out our documentation on [attaching volumes](/storage/block/how-to/attach-a-volume/) and [mounting volumes](/storage/block/api-cli/managing-a-volume/#mounting-the-block-volume) to learn how to use the volume with your Instances.
-=======
-    The volume is created, and can be viewed in the [Volumes tab](https://console.scaleway.com/instance/volumes). Check out our documentation on [attaching volumes](/storage/block/how-to/attach-a-volume) and [mounting volumes](/storage/block/api-cli/managing-a-volume/#mounting-the-block-volume) to learn how to use the volume with your Instances.
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+    The volume is created, and can be viewed in the [Volumes tab](https://console.scaleway.com/instance/volumes). Check out our documentation on [attaching volumes](/storage/block/how-to/attach-a-volume/) and [mounting volumes](/storage/block/api-cli/managing-a-volume/#mounting-the-block-volume) to learn how to use the volume with your Instances.
 
 ## How to create an Instance from a snapshot
 

compute/instances/how-to/migrate-routed-ips.mdx

@@ -28,13 +28,8 @@ Using a routed flexible IP is recommended for all compatible Instance types, as
 
 <Macro id="requirements" />
 
-<<<<<<< HEAD
-- A Scaleway account logged into the [console](https://console.scaleway.com/)
-- An [Instance](/compute/instances/how-to/create-an-instance/) that has not been moved to routed IPs
-=======
 - A Scaleway account logged into the [console](https://console.scaleway.com)
-- An [Instance](/compute/instances/how-to/create-an-instance) that has not been moved to routed IPs
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+- An [Instance](/compute/instances/how-to/create-an-instance/) that has not been moved to routed IPs
 
 ## Updating the required packages
 

compute/instances/reference-content/understanding-instance-pricing.mdx

@@ -25,13 +25,8 @@ Our [console](https://console.scaleway.com/) tries to make it as easy as possibl
 ## Hourly pricing
 
 Instances are priced by the hour, with different [Instance types](/compute/instances/reference-content/choosing-instance-type/) having different hourly rates. You can check out the current prices for Instances in one of two ways:
-<<<<<<< HEAD
-- Go to the Instance [creation page](https://console.scaleway.com/instance/servers/create/) of the Scaleway console. Note that you must have [an account](/console/account/how-to/create-an-account/) to access this page.
-- See the dedicated [pricing page](https://www.scaleway.com/en/pricing/?tags=available/) of our website.
-=======
-- Go to the Instance [creation page](https://console.scaleway.com/instance/servers/create) of the Scaleway console. Note that you must have [an account](/console/account/how-to/create-an-account) to access this page.
+- Go to the Instance [creation page](https://console.scaleway.com/instance/servers/create) of the Scaleway console. Note that you must have [an account](/console/account/how-to/create-an-account/) to access this page.
 - See the dedicated [pricing page](https://www.scaleway.com/en/pricing/?tags=available) of our website.
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
 
 ## Instance billing
 

compute/instances/troubleshooting/reboot-from-faulty-kernel.mdx

@@ -17,15 +17,9 @@ categories:
 
 <Macro id="requirements" />
 
-<<<<<<< HEAD
-- A Scaleway account logged into the [console](https://console.scaleway.com/)
-- An [Instance](/compute/instances/how-to/create-an-instance/)
-- Installed and configured the Scaleway [CLI](/compute/instances/api-cli/creating-managing-instances-with-cliv2/) on your local computer
-=======
 - A Scaleway account logged into the [console](https://console.scaleway.com)
-- An [Instance](/compute/instances/how-to/create-an-instance)
+- An [Instance](/compute/instances/how-to/create-an-instance/)
 - Installed and configured the Scaleway [CLI](/compute/instances/api-cli/creating-managing-instances-with-cliv2) on your local computer
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
 
 
 1. Switch the Instance's `boot-type` to `rescue` and reboot your Instance into rescue mode using the CLI-Tools: 

console/billing/how-to/add-payment-method.mdx

@@ -53,13 +53,8 @@ Before you can order Scaleway resources, you must add a payment method to your a
 ## How to add a SEPA mandate
 
 <Message type="important">
-<<<<<<< HEAD
   * This method requires a successful [KYC verification](/console/account/how-to/verify-identity/).
-  * To add a SEPA mandate, both your postal and bank addresses must be part of the [SEPA zone](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html/).
-=======
-  * This method requires a successful [KYC verification](/console/account/how-to/verify-identity).
   * To add a SEPA mandate, both your postal and bank addresses must be part of the [SEPA zone](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html).
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
 </Message>
 
 1. Access the [Scaleway console](https://console.scaleway.com/organization).

containers/kubernetes/api-cli/changing-control-plane-offer.mdx

@@ -24,13 +24,8 @@ In this tutorial, we show you how to change your cluster type using the Scaleway
 - A Scaleway account logged into the [console](https://console.scaleway.com)
 - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization
 - A valid [API key](/identity-and-access-management/iam/how-to/create-api-keys/)
-<<<<<<< HEAD
-- Downloaded and installed the most recent version of the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2/)
-- [Created a cluster](/containers/kubernetes/how-to/create-cluster/)
-=======
 - Downloaded and installed the most recent version of the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2)
-- [Created a cluster](/containers/kubernetes/how-to/create-cluster)
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+- [Created a cluster](/containers/kubernetes/how-to/create-cluster/)
 
 1. Run the following command to list the viable cluster types.
     ```

containers/kubernetes/how-to/deploy-image-from-container-registry.mdx

@@ -65,11 +65,7 @@ The generated Docker images are stored in a private Docker registry using the Sc
     REPOSITORY                                             TAG                 IMAGE ID            CREATED             SIZE
     mycontainer                                            latest              c427b132b5fc        22 minutes ago      1.24GB
     ```
-<<<<<<< HEAD
-5. [Log into your Container Registry](/containers/container-registry/how-to/connect-docker-cli/). The endpoint (for example: `rg.fr-par.scw.cloud/myregistry`) of your Container Registry is available from the [Scaleway console](https://console.scaleway.com/registry/namespaces/) and depends on your configuration:
-=======
-5. [Log into your Container Registry](/containers/container-registry/how-to/connect-docker-cli). The endpoint (for example: `rg.fr-par.scw.cloud/myregistry`) of your Container Registry is available from the [Scaleway console](https://console.scaleway.com/registry/namespaces) and depends on your configuration:
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+5. [Log into your Container Registry](/containers/container-registry/how-to/connect-docker-cli/). The endpoint (for example: `rg.fr-par.scw.cloud/myregistry`) of your Container Registry is available from the [Scaleway console](https://console.scaleway.com/registry/namespaces) and depends on your configuration:
     ```bash
     docker login rg.fr-par.scw.cloud/myregistry -u nologin -p $SCW_SECRET_KEY
     ```

dedibox-network/domains/how-to/file-contact-info.mdx

@@ -16,11 +16,7 @@ categories:
 You must always ensure that the contact information for the domain owner is accurate and correct. You are prompted to provide and/or check contact details when you are ordering or renewing your domain. It is your responsibility to keep this information up-to-date after that. This document shows you how to check and modify this information.
 
 <Message type="important">
-<<<<<<< HEAD
-  If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade/).
-=======
-  If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership) process via the [console](https://console.online.net/fr/domain/trade).
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+  If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade).
 </Message>
 
 <Macro id="requirements" />

dedibox-network/domains/how-to/purchase-domain.mdx

@@ -40,11 +40,7 @@ A domain name is the equivalent of your postal address on the web, and allows yo
     <Lightbox src="scaleway-order-domain-contact.webp" alt="" />
 
     <Message type = "important">
-<<<<<<< HEAD
-      You must always keep the contact details relating to the owner of your domain name accurate and up-to-date. Once created, if you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade/).
-=======
-      You must always keep the contact details relating to the owner of your domain name accurate and up-to-date. Once created, if you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership) process via the [console](https://console.online.net/fr/domain/trade).
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+      You must always keep the contact details relating to the owner of your domain name accurate and up-to-date. Once created, if you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade).
     </Message>
 9. Scroll down to the bottom of the page and click **Confirm**.
 

dedibox-network/domains/how-to/transfer-domain.mdx

@@ -44,11 +44,7 @@ You can transfer any domain bought or renewed at another registrar to Scaleway a
 8. If you did not select hosting backup, a pop-up may display asking you to confirm your choice. Click **Continue without backup** or **Add backup**. The **Contact information** page displays.
 9. Complete the contact information for the domain name.
     <Message type = "important">
-<<<<<<< HEAD
-      You must always keep the domain owner’s contact details accurate and up-to-date. If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade/).
-=======
-      You must always keep the domain owner’s contact details accurate and up-to-date. If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership) process via the [console](https://console.online.net/fr/domain/trade).
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+      You must always keep the domain owner’s contact details accurate and up-to-date. If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade).
     </Message>
 10. Scroll down to the bottom of the page and click **Confirm**. The **Summary** page displays.
 11. Check the summary of your order and select a payment mode from the drop-down menu. You must also agree to the terms of service as well as the web hosting specific terms, and choose whether to activate automatic renewal of your domain.

dedibox-network/ip-failover/how-to/assign-failover-ip.mdx

@@ -21,13 +21,8 @@ For each server, you can add failover IP addresses according to the offer and yo
 
 <Macro id="requirements" />
 
-<<<<<<< HEAD
-- A Dedibox account logged into the [console](https://console.online.net/)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
-=======
 - A Dedibox account logged into the [console](https://console.online.net)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
 
 <Macro id="failover-ip" />
 

dedibox-network/ip-failover/how-to/configure-centos.mdx

@@ -17,13 +17,8 @@ This page shows you how to configure a [failover IP](/dedibox-network/ip-failove
 
 <Macro id="requirements" />
 
-<<<<<<< HEAD
-- A Dedibox account logged into the [console](https://console.online.net/)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
-=======
 - A Dedibox account logged into the [console](https://console.online.net)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
 
 ## Failover IP configuration using the Network Manager
 

dedibox-network/ip-failover/how-to/configure-debian-ubuntu.mdx

@@ -17,13 +17,8 @@ This page shows you how to configure a [failover IP](/dedibox-network/ip-failove
 
 <Macro id="requirements" />
 
-<<<<<<< HEAD
-- A Dedibox account logged into the [console](https://console.online.net/)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
-=======
 - A Dedibox account logged into the [console](https://console.online.net)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
 
 ## Failover IP configuration on Debian
 

dedibox-network/ip-failover/how-to/configure-freebsd.mdx

@@ -17,13 +17,8 @@ This page shows you how to configure a [failover IP](/dedibox-network/ip-failove
 
 <Macro id="requirements" />
 
-<<<<<<< HEAD
-- A Dedibox account logged into the [console](https://console.online.net/)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
-=======
 - A Dedibox account logged into the [console](https://console.online.net)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
 
 ## Failover IP configuration on FreeBSD
 

dedibox-network/ip-failover/how-to/configure-multiip-virtualmac.mdx

@@ -21,13 +21,8 @@ As long as they share the same virtual MAC, your failover IPs must be moved in a
 
 <Macro id="requirements" />
 
-<<<<<<< HEAD
-- A Dedibox account logged into the [console](https://console.online.net/)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
-=======
 - A Dedibox account logged into the [console](https://console.online.net)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server
 - At least 2 [failover IPs](/dedibox-network/ip-failover/concepts/#failover-ips)
 - Generated a [virtual MAC address](/dedibox-network/ip-failover/concepts/#virtual-mac-address)
 

dedibox-network/ip-failover/how-to/configure-network-virtual-machine.mdx

@@ -25,13 +25,8 @@ To communicate on the internet, each of your virtual machines needs an IP addres
 
 <Macro id="requirements" />
 
-<<<<<<< HEAD
-- A Dedibox account logged into the [console](https://console.online.net/)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server and installed a hypervisor on it
-=======
 - A Dedibox account logged into the [console](https://console.online.net)
-- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server and installed a hypervisor on it
->>>>>>> parent of ff71e3252 (fix(gen): backslashes)
+- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server and installed a hypervisor on it
 - Ordered a [failover IP](/dedibox-network/ip-failover/concepts/#failover-ips)
 - Generated a [virtual MAC address](/dedibox-network/ip-failover/concepts/#virtual-mac-address)