diff --git a/hosts/kos-mos/default.nix b/hosts/kos-mos/default.nix
index 8b8f766..d983701 100644
--- a/hosts/kos-mos/default.nix
+++ b/hosts/kos-mos/default.nix
@@ -9,8 +9,6 @@
 
   networking.hostName = "kos-mos";
   networking.hostId = "472479d4";
-<<<<<<< HEAD
-=======
 
   xeserv.services.robocadey.enable = true;
   age.secrets.robocadey = {
@@ -18,5 +16,4 @@
     path = "/var/lib/private/xeserv.robocadey/.env";
     mode = "0666";
   };
->>>>>>> 8c3057c (fix???)
 }