resolve merge conflict (#827)

src/pages/get-started/install/synology.mdx

@@ -116,7 +116,7 @@ rm -rf /var/lib/netbird
 
 4. Remove the Peer from the NetBird UI.
 
-For a complete cleanup, you should also remove the Synology NAS as a peer from your NetBird account. Log in to the NetBird web UI and navigate to `Peers` → `Servers`. Find the peer corresponding to your Synology NAS and delete it.
+For a complete cleanup, you should also remove the Synology NAS as a peer from your NetBird account. Log in to the NetBird web UI and navigate to `Peers`. Find the peer corresponding to your Synology NAS and delete it.
 
 ## Video Walkthrough
 

src/pages/manage/for-partners/acronis-integration.mdx

@@ -629,8 +629,8 @@ While Acronis Cyber Protect Cloud handles the automated deployment of NetBird cl
 
 For example, organizations using Microsoft 365 can use the [NetBird-Microsoft Entra ID integration](https://docs.netbird.io/manage/team/idp-sync/microsoft-entra-id-sync#get-started-with-net-bird-entra-id-integration) to automatically authenticate and synchronize users and groups from Entra ID to NetBird. This integration eliminates manual user provisioning by automatically syncing organizational structure, including group memberships and user access permissions. Once synchronized, users automatically inherit the corresponding Access Control Policies created in the initial configuration section (`IT Administrators` group has access to the `Windows Workstations` group), ensuring that network access permissions align with their organizational roles.
 
-To confirm that your Acronis-deployed Windows (or macOS) endpoints successfully joined NetBird, navigate to `Peers` → `Servers` in your NetBird dashboard. Successfully registered endpoints will appear in the peers list with their device names, connection status, and assigned IP addresses within your NetBird network. 
+To confirm that your Acronis-deployed Windows (or macOS) endpoints successfully joined NetBird, navigate to `Peers` in your NetBird dashboard. Successfully registered endpoints will appear in the peers list with their device names, connection status, and assigned IP addresses within your NetBird network.
 
 This verification step ensures that your automated deployment process has completed successfully and that devices are ready to enforce the access control policies configured for your organization's security requirements.
 
-![Windows 11 Peer](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-21.png)
+![Windows 11 Peer](/docs-static/img/manage/for-partners/acronis-windows-netbird-integration/acronis-windows-21.png)

src/pages/manage/integrations/mdm-deployment/jamf-pro-netbird-integration.mdx

@@ -140,11 +140,11 @@ If you see the NetBird policy listed, that would indicate that NetBird has been
 To further verify the integration, check that the machine has been added to your NetBird network:
 
 * Log into a NetBird account with administrative privileges.
-* Go to `Peers` → `Servers`.
+* Go to `Peers`.
 * Look for the newly enrolled machine in the list of peers.
 
 If you can see the new machine listed as a peer in NetBird, this confirms that the automated provisioning process is working correctly and the device has been successfully added to your NetBird network.
 
 By following these verification steps, you can ensure that your Jamf Pro policy is effectively deploying NetBird to your managed devices and integrating them into your secure network infrastructure.
 
-This tutorial taught you how to seamlessly integrate NetBird's VPN solution with Jamf Pro for Apple devices. By configuring NetBird Access Policies, creating a Jamf Pro policy for automated deployment, and verifying the provisioning process, you've established a solid system for managing secure network access across your organization.
+This tutorial taught you how to seamlessly integrate NetBird's VPN solution with Jamf Pro for Apple devices. By configuring NetBird Access Policies, creating a Jamf Pro policy for automated deployment, and verifying the provisioning process, you've established a solid system for managing secure network access across your organization.

src/pages/manage/integrations/mdm-deployment/kandji-netbird-integration.mdx

@@ -185,8 +185,8 @@ To verify the deployment pipeline, navigate to `DEVICES` in Kandji, select an en
 
 ![Verifying Blueprint logic](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-15.png)
 
-You can also confirm the process in NetBird. Log in to a NetBird account with administrative privileges, navigate to `Peers` → `Servers`, and look for the new device.
+You can also confirm the process in NetBird. Log in to a NetBird account with administrative privileges, navigate to `Peers`, and look for the new device.
 
 ![Verifying peer in NetBird](/docs-static/img/manage/integrations/mdm-deployment/kandji-netbird-integration//netbird-kandji-16.png)
 
-In this tutorial, you've learned how to integrate NetBird's VPN solution with Kandji MDM for Apple devices. By configuring NetBird Access Policies, creating Kandji MDM Blueprints, and setting up an automated deployment pipeline, you've established a robust system for managing network access across your organization.
+In this tutorial, you've learned how to integrate NetBird's VPN solution with Kandji MDM for Apple devices. By configuring NetBird Access Policies, creating Kandji MDM Blueprints, and setting up an automated deployment pipeline, you've established a robust system for managing network access across your organization.

src/pages/manage/network-routes/use-cases/exit-nodes.mdx

@@ -55,7 +55,7 @@ Clients running v0.55.0 or later auto-apply these routes unless the user has exp
 
 ### 1. Open the Servers list
 
-Navigate to the NetBird dashboard and open **Peers** → **Servers** (exit nodes are typically unattended machines like a VPS, router, or always-on host).
+Navigate to the NetBird dashboard and open **Peers** (exit nodes are typically unattended machines like a VPS, router, or always-on host).
 
 <p>
     <img src="/docs-static/img/manage/network-routes/use-cases/exit-nodes/netbird-peers.png" alt="Dashboard peers view" className="imagewrapper-big"/>

src/pages/manage/peers/access-infrastructure/peer-approval-for-remote-worker-access.mdx

@@ -109,7 +109,7 @@ Back to your primary account, you'll notice the newly added user's status is now
 
 However, your approval is required before the user's device can fully connect to the NetBird network. To grant network access:
 
-* Navigate to `Peers` → `User Devices`
+* Navigate to `Peers`
 * Locate the newly added device
 * Click the `Approve` button next to the device
 * Confirm the action when prompted
@@ -140,5 +140,3 @@ To activate this feature, navigate to `Integrations > EDR` and activate the Crow
 ![NetBird EDR Integration](/docs-static/img/manage/peers/access-infrastructure/peer-approval-for-remote-worker-access/peer-a-18.png)
 
 For more information regarding NetBird's EDR integration, refer to the [documentation](/manage/access-control/endpoint-detection-and-response)
-
-

src/pages/manage/peers/access-infrastructure/secure-remote-webserver-access.mdx

@@ -96,7 +96,7 @@ Routes: -
 Peers count: 0/0 Connected
 ```
 
-Now, go back to NetBird's `Peers` → `Servers` view and ensure your remote web server is connected.
+Now, go back to NetBird's `Peers` view and ensure your remote web server is connected.
 
 ![NetBird Peers Network](/docs-static/img/manage/peers/access-infrastructure/secure-remote-webserver-access/8I1WVEx.png)
 
@@ -122,7 +122,7 @@ This policy restricts SSH access to the `Testing Environment`, permitting only a
 
 After establishing the policy, assign peers to their respective groups. To add the remote web server to the `Testing Environment` group:
 
-* Navigate to `Peers` → `Servers` in the left menu
+* Navigate to `Peers` in the left menu
 * Click on the name of the peer you want to edit, in this case, `webserver`
 * Find the `Assigned Groups` field and select `Testing Environment` from the dropdown list.
 

src/pages/manage/peers/access-infrastructure/setup-keys-add-servers-to-network.mdx

@@ -128,7 +128,7 @@ Next, ensure NetBird starts automatically on boot:
 sudo systemctl enable netbird
 ```
 
-Finally, log into your NetBird dashboard and navigate to `Peers` → `Servers` to confirm your VM is listed and connected.
+Finally, log into your NetBird dashboard and navigate to `Peers` to confirm your VM is listed and connected.
 
 ![NetBird Peers View](/docs-static/img/manage/peers/access-infrastructure/setup-keys-add-servers-to-network/setup-keys-add-server-02.png)
 
@@ -172,7 +172,7 @@ Notice that the container is accessible on port `8080` of the VM. You'll use thi
 
 Now that your VM is connected to the NetBird secure network, you can verify the connection using either `curl` or your web browser. Simply use the NetBird-assigned IP address or domain for the VM to access the deployed web server.
 
-To locate the NetBird-assigned IP or domain, go to `Peers` → `Servers` in your NetBird dashboard and hover your cursor over the VM's name.
+To locate the NetBird-assigned IP or domain, go to `Peers` in your NetBird dashboard and hover your cursor over the VM's name.
 
 ![NetBird Peers IP Address or Domain](/docs-static/img/manage/peers/access-infrastructure/setup-keys-add-servers-to-network/setup-keys-add-server-03.png)
 
@@ -211,4 +211,4 @@ You can then use the NetBird SSH client to connect to your VM:
 sudo netbird ssh <NETBIRD_DOMAIN | NETBIRD_IP>
 ```
 
-Summing up, NetBird's setup keys solve the challenge of securely connecting unattended resources, streamlining the integration of servers and containers without user intervention. For those looking to scale, the [NetBird API](https://docs.netbird.io/api/resources/setup-keys) offers powerful automation capabilities, allowing programmatic management of peers, setup keys, and access policies. These features combine to create a robust, secure, and easily manageable network infrastructure that adapts to your organization's needs.
+Summing up, NetBird's setup keys solve the challenge of securely connecting unattended resources, streamlining the integration of servers and containers without user intervention. For those looking to scale, the [NetBird API](https://docs.netbird.io/api/resources/setup-keys) offers powerful automation capabilities, allowing programmatic management of peers, setup keys, and access policies. These features combine to create a robust, secure, and easily manageable network infrastructure that adapts to your organization's needs.

src/pages/manage/peers/add-machines-to-your-network.mdx

@@ -15,7 +15,7 @@ For details on adding machines to your network, part of our "Getting started wit
 ## Use NetBird web UI to add new peers
 
 To add a new peer to your network follow these steps:
-1. Sign-in to your NetBird account at https://app.netbird.io/ and go to `Peers` → `User Devices` (or `Peers` → `Servers` for unattended machines like VMs and containers).
+1. Sign-in to your NetBird account at https://app.netbird.io/ and go to `Peers`.
 2. Hit `Add Peer` button
 
 <p>

src/pages/manage/peers/approve-peers.mdx

@@ -28,7 +28,7 @@ To enable peer approval, navigate to [Settings » Authentication](https://a
 </Note>
 
 ## Approve peer
-To approve a peer, navigate to the [Peers section](https://app.netbird.io/peers) (pending peers appear under both `User Devices` and `Servers`) and click the `Approve` button on the right side of the peers table.
+To approve a peer, navigate to the [Peers section](https://app.netbird.io/peers) and click the `Approve` button on the right side of the peers table.
 
 <p>
     <img src="/docs-static/img/manage/peers/approve-peers/peer-needs-approval.png" alt="peer-needs-approval" className="imagewrapper"/>

src/pages/manage/peers/register-machines-using-setup-keys.mdx

@@ -85,7 +85,7 @@ In the dialog that opens, give your new key a recognizable name, choose its type
 The defaults are suitable for most cases. For security reasons, we recommend using one-off keys.
 
 <Note>
-You can also generate a setup key while adding a peer. Go to `Peers` → `Servers` → `Add Peer` and click `Generate Key`. This is the most common path when enrolling a new server or routing peer. It creates a one-off key that expires in 24 hours with no auto-assigned groups. To control the key type, expiration, usage limit, or auto-groups, create the key from `Settings` → `Setup Keys` instead.
+You can also generate a setup key while adding a peer. Go to `Peers` → `Add Peer` and click `Generate Key`. This is the most common path when enrolling a new server or routing peer. It creates a one-off key that expires in 24 hours with no auto-assigned groups. To control the key type, expiration, usage limit, or auto-groups, create the key from `Settings` → `Setup Keys` instead.
 </Note>
 
 <p>

src/pages/manage/settings/enforce-periodic-user-authentication.mdx

@@ -32,7 +32,7 @@ You can also disable the expiration for the whole network in the same section.
 ## Disable expiration individually per peer
 Sometimes, you might want to disable peer expiration for some peers.
 With NetBird you can disable login expiration per peer without disabling expiration globally.
-In `Peers` → `User Devices` click on the peer you want to disable expiration for and use the Login Expiration switch. (Session expiration only applies to peers with a user behind them; peers enrolled with a setup key under `Servers` are already exempt.)
+In `Peers` click on the peer you want to disable expiration for and use the Login Expiration switch. (Session expiration only applies to peers with a user behind them; peers enrolled with a setup key are already exempt.)
 Peers with `Expiration disabled` will be marked with a corresponding label in the Peers table.
 
 <p>
@@ -47,4 +47,4 @@ Peers with `Expiration disabled` will be marked with a corresponding label in th
 - Make sure to [star us on GitHub](https://github.com/netbirdio/netbird)
 - Follow us [on X](https://x.com/netbird)
 - Join our [Slack Channel](/slack-url)
-- NetBird [latest release](https://github.com/netbirdio/netbird/releases) on GitHub
+- NetBird [latest release](https://github.com/netbirdio/netbird/releases) on GitHub