fix conflicts

Author: JTorreG

content/includes/agent/installation/update-container.md

@@ -15,7 +15,7 @@ wget https://raw.githubusercontent.com/nginx/agent/refs/heads/v3/scripts/package
 ```
 
 If your NGINX Agent container was previously a member of a config sync group, then your NGINX Agent config must be manually updated to add the config sync group label.
-See [Add Config Sync Group]({{< ref "/nginx-one/config-sync-groups/manage-config-sync-groups.md" >}}) for more information.
+See [Add Config Sync Group]({{< ref "/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md" >}}) for more information.
 
 ### Rolling back from NGINX Agent v3 to v2
 

content/nginx-one/agent/install-upgrade/install-from-github.md

@@ -10,7 +10,7 @@ If you are using [NGINX One Console]({{< ref "/nginx-one/getting-started.md" >}}
 to manage your NGINX instances, NGINX Agent is installed automatically when you
 add an NGINX instance to NGINX One Console.
 
-For a quick guide on how to connect your instance to NGINX One Console see: [Connect to NGINX One Console]({{< ref "/nginx-one/nginx-configs/add-instance" >}})
+For a quick guide on how to connect your instance to NGINX One Console see: [Connect to NGINX One Console]({{< ref "/nginx-one/connect-instances/add-instance.md" >}})
 {{< /note >}}
 
 Follow the steps in this guide to install NGINX Agent in your NGINX instance using

content/nginx-one/agent/install-upgrade/install-from-oss-repo.md

@@ -10,7 +10,7 @@ If you are using [NGINX One Console]({{< ref "/nginx-one/getting-started.md" >}}
 to manage your NGINX instances, NGINX Agent is installed automatically when you
 add an NGINX instance to NGINX One Console.
 
-For a quick guide on how to connect your instance to NGINX One Console see: [Connect to NGINX One Console]({{< ref "/nginx-one/nginx-configs/add-instance" >}})
+For a quick guide on how to connect your instance to NGINX One Console see: [Connect to NGINX One Console]({{< ref "/nginx-one/connect-instances/add-instance.md" >}})
 {{< /note >}}
 
 ## Overview

content/nginx-one/agent/install-upgrade/install-from-plus-repo.md

@@ -10,7 +10,7 @@ If you are using [NGINX One Console]({{< ref "/nginx-one/getting-started.md" >}}
 to manage your NGINX instances, NGINX Agent is installed automatically when you
 add an NGINX instance to NGINX One Console.
 
-For a quick guide on how to connect your instance to NGINX One Console see: [Connect to NGINX One Console]({{< ref "/nginx-one/nginx-configs/add-instance" >}})
+For a quick guide on how to connect your instance to NGINX One Console see: [Connect to NGINX One Console]({{< ref "/nginx-one/connect-instances/add-instance.md" >}})
 {{< /note >}}
 
 ## Overview

content/nginx-one/agent/metrics/configure-otel-metrics.md

@@ -26,7 +26,7 @@ You can validate that metrics are successfully exported by using the methods bel
 
 - **NGINX One dashboard**
 
-   - When an instance has connected to NGINX One Console [See: Connect to NGINX One Console]({{< ref "/nginx-one/nginx-configs/add-instance.md" >}}), you should see metrics showing on the NGINX One Dashboard.
+   - When an instance has connected to NGINX One Console [See: Connect to NGINX One Console]({{< ref "/nginx-one/connect-instances/add-instance.md" >}}), you should see metrics showing on the NGINX One Dashboard.
 
 - **Agent logs**
 

content/nginx-one/connect-instances/add-instance.md

@@ -19,15 +19,9 @@ Before you add an instance to NGINX One Console, ensure:
 - You have [administrator access]({{< ref "/nginx-one/rbac/roles.md" >}}) to NGINX One Console.
 - You have [configured instances of NGINX]({{< ref "/nginx-one/getting-started.md#add-your-nginx-instances-to-nginx-one" >}}) that you want to manage through NGINX One Console.
 - You have or are ready to configure a [data plane key]({{< ref "/nginx-one/getting-started.md#generate-data-plane-key" >}}).
-<<<<<<<< HEAD:content/nginx-one/nginx-configs/add-instance.md
-- You have or are ready to set up [managed certificates]({{< ref "/nginx-one/certificates/manage-certificates.md" >}}).
-
-{{< note >}}If this is the first time an instance is being added to a Config Sync Group, and you have not yet defined the configuration for that Config Sync Group, that instance provides the template for that group. For more information, see [Configuration management]({{< ref "nginx-one/config-sync-groups/manage-config-sync-groups#configuration-management" >}}).{{< /note >}}
-========
 - You have or are ready to set up [managed certificates]({{< ref "/nginx-one/nginx-configs/certificates/manage-certificates.md" >}}).
 
 {{< note >}}If this is the first time an instance is being added to a Config Sync Group, and you have not yet defined the configuration for that Config Sync Group, that instance provides the template for that group. For more information, see [Configuration management]({{< ref "nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups#configuration-management" >}}).{{< /note >}}
->>>>>>>> origin:content/nginx-one/connect-instances/add-instance.md
 
 ## Add an instance
 
@@ -59,9 +53,5 @@ Once you've completed the process, NGINX One reassigns this as a managed certifi
 
 ## Add an instance to a Config Sync Group
 
-<<<<<<<< HEAD:content/nginx-one/nginx-configs/add-instance.md
-When you [Manage Config Sync Group membership]({{< ref "nginx-one/config-sync-groups/manage-config-sync-groups#manage-config-sync-group-membership" >}}), you can add an existing or new instance to the group of your choice.
-========
 When you [Manage Config Sync Group membership]({{< ref "nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups#manage-config-sync-group-membership" >}}), you can add an existing or new instance to the group of your choice.
->>>>>>>> origin:content/nginx-one/connect-instances/add-instance.md
-That instance inherits the setup of that Config Sync Group.
+That instance inherits the setup of that Config Sync Group.

content/nginx-one/nginx-configs/add-instance.md

@@ -35,11 +35,7 @@ From the NGINX One Console you can:
 You can manage the certificates for:
 
 - [Unique instances]({{< ref "/nginx-one/nginx-configs/add-file.md#new-ssl-certificate-or-ca-bundle" >}})
-<<<<<<<< HEAD:content/nginx-one/certificates/manage-certificates.md
-- For all instances that are members of a [Config Sync Group]({{< ref "/nginx-one/config-sync-groups/manage-config-sync-groups/#configuration-management" >}})
-========
 - For all instances that are members of a [Config Sync Group]({{< ref "/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups/#configuration-management" >}})
->>>>>>>> origin:content/nginx-one/nginx-configs/certificates/manage-certificates.md
 
 
 {{< tip >}}
@@ -197,11 +193,6 @@ To convert these cerificates to managed, start with the Certificates menu, and s
 
 ## See also
 
-<<<<<<<< HEAD:content/nginx-one/certificates/manage-certificates.md
-- [Create and manage data plane keys]({{< ref "/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys.md" >}})
-- [View and edit NGINX configurations]({{< ref "/nginx-one/nginx-configs/view-edit-nginx-configurations.md" >}})
-========
 - [Create and manage data plane keys]({{< ref "/nginx-one/connect-instances/create-manage-data-plane-keys.md" >}})
 - [Add an instance]({{< ref "/nginx-one/connect-instances/add-instance.md" >}})
->>>>>>>> origin:content/nginx-one/nginx-configs/certificates/manage-certificates.md
-- [Add a file in a configuration]({{< ref "/nginx-one/nginx-configs/add-file.md" >}})
+- [Add a file in a configuration]({{< ref "/nginx-one/nginx-configs/add-file.md" >}})

content/nginx-one/nginx-configs/certificates/manage-certificates.md

@@ -58,20 +58,10 @@ Enter the name of the desired configuration file, such as `abc.conf` and select
 ### Existing SSL Certificate or CA Bundle
 
 {{< include "nginx-one/add-file/existing-ssl-bundle.md" >}}
-<<<<<<<< HEAD:content/nginx-one/config-sync-groups/add-file-csg.md
-With this option, You can incorporate [Managed certificates]({{< ref "/nginx-one/certificates/manage-certificates.md#managed-and-unmanaged-certificates" >}}).
-
-## See also
-
-- [Create and manage data plane keys]({{< ref "/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys.md" >}})
-- [View and edit NGINX configurations]({{< ref "/nginx-one/nginx-configs/view-edit-nginx-configurations.md" >}})
-- [Manage certificates]({{< ref "/nginx-one/certificates/manage-certificates.md" >}})
-========
 With this option, you can incorporate [Managed certificates]({{< ref "/nginx-one/nginx-configs/certificates/manage-certificates.md#managed-and-unmanaged-certificates" >}}).
 
 ## See also
 
 - [Create and manage data plane keys]({{< ref "/nginx-one/connect-instances/create-manage-data-plane-keys.md" >}})
 - [Add an NGINX instance]({{< ref "/nginx-one/connect-instances/add-instance.md" >}})
-- [Manage certificates]({{< ref "/nginx-one/nginx-configs/certificates/manage-certificates.md" >}})
->>>>>>>> origin:content/nginx-one/nginx-configs/config-sync-groups/add-file-csg.md
+- [Manage certificates]({{< ref "/nginx-one/nginx-configs/certificates/manage-certificates.md" >}})

content/nginx-one/nginx-configs/config-sync-groups/add-file-csg.md

@@ -257,10 +257,5 @@ Monitor the **Config Sync Status** column. It can help you ensure that your conf
 
 ## See also
 
-<<<<<<<< HEAD:content/nginx-one/config-sync-groups/manage-config-sync-groups.md
-- [Create and manage data plane keys]({{< ref "/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys.md" >}})
-- [View and edit NGINX configurations]({{< ref "/nginx-one/nginx-configs/view-edit-nginx-configurations.md" >}})
-========
 - [Create and manage data plane keys]({{< ref "/nginx-one/connect-instances/create-manage-data-plane-keys.md" >}})
-- [Add an NGINX instance]({{< ref "/nginx-one/connect-instances/add-instance.md" >}})
->>>>>>>> origin:content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md
+- [Add an NGINX instance]({{< ref "/nginx-one/connect-instances/add-instance.md" >}})