diff --git a/modules/nixos/core/network.nix b/modules/nixos/core/network.nix
index 2f3b7a0..271015c 100644
--- a/modules/nixos/core/network.nix
+++ b/modules/nixos/core/network.nix
@@ -33,6 +33,7 @@
 
         privateKeyFile = "/home/muon/wireguard-keys/private";
 
+<<<<<<< HEAD
         peers = [
           {
             publicKey = "2RF8GmTZwQdzVm2l2piYy6U0qiMU3wSxC7Lt8urAjwA=";
@@ -41,6 +42,17 @@
             persistentKeepalive = 25;
           }
         ];
+=======
+          peers = [
+            {
+              publicKey = "2RF8GmTZwQdzVm2l2piYy6U0qiMU3wSxC7Lt8urAjwA=";
+              allowedIPs = [ "0.0.0.0/0" ];
+              endpoint = "93.95.230.11:51820";
+              persistentKeepalive = 25;
+            }
+          ];
+        };
+>>>>>>> 72a6e123de1f980f2e2e2bc6dbbf666b396660eb
       };
     };