diff --git a/domains/sea.fudo.org.nix b/domains/sea.fudo.org.nix
index 723350c..9b682c7 100644
--- a/domains/sea.fudo.org.nix
+++ b/domains/sea.fudo.org.nix
@@ -12,12 +12,8 @@
 
   ldap-servers = [ "nutboy3" "legatus" ];
 
-<<<<<<< HEAD
   postgresql-server = "nostromo";
-=======
   kerberos-master = "nostromo";
-  # kerberos-slaves = [ "lambda" ];
->>>>>>> 45f0457328e0bdf5dbc6c103af0d703d46d9a2b2
 
   prometheus-hosts = [ "limina" ];
   grafana-hosts = [ "nostromo" ];