diff --git a/nixos/openssh.nix b/nixos/openssh.nix
index 4ec1497..7ac1267 100644
--- a/nixos/openssh.nix
+++ b/nixos/openssh.nix
@@ -10,6 +10,14 @@
       PermitRootLogin = "no";
     };
   };
+<<<<<<< HEAD
 
   networking.firewall.allowedTCPPorts = [ 22 ];
+||||||| parent of 1c2f11d (lib/ssh: add more ssh keys)
+
+  users.users.root.openssh.authorizedKeys.keys = builtins.attrValues {
+    inherit (import "${self}/lib/ssh/keys.nix") error javalsai;
+  };
+=======
+>>>>>>> 1c2f11d (lib/ssh: add more ssh keys)
 }