diff --git a/hosts/darkgui-vps/config/self-host/self-host.nix b/hosts/darkgui-vps/config/self-host/self-host.nix
index a59da54..3dab9a6 100644
--- a/hosts/darkgui-vps/config/self-host/self-host.nix
+++ b/hosts/darkgui-vps/config/self-host/self-host.nix
@@ -8,10 +8,6 @@
 {
 
   mods = {
-<<<<<<< HEAD
-    #netbird.enable = true;
-=======
->>>>>>> dd8334c9c024018cca7a75216d680779a606da8a
     tailscale.enable = true;
     flakePath = "/etc/nixos";
   };
diff --git a/mods/nixos/netbird/netbird.nix b/mods/nixos/netbird/netbird.nix
deleted file mode 100644
index 073c87f..0000000
--- a/mods/nixos/netbird/netbird.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  options.mods.netbird = {
-    enable = lib.mkEnableOption "netbird";
-  };
-
-  config = lib.mkIf config.mods.netbird.enable {
-    services.resolved.enable = false;
-  };
-}