fix things

configuration.nix

@@ -143,16 +143,14 @@
           publicKey = "il12KBAwODC1TTZgT4JIL0f6AZcYWxylmuVlTlWd80s=";
           allowedIPs = [ "10.100.0.18/32" ];
         }
-<<<<<<< HEAD
         { # Mari
           publicKey = "NfEjPn+ZYgB1vfNZ353AQOKPZLKUt4gPoNUSrywXjl0=";
           allowedIPs = [ "10.100.0.20/32" ]
         }
-	{ # WiTu
+	      { # WiTu
       	  publicKey = "k+PkzHREDszWnzvY79JcBL2XCkwtQ/XSunxNft7pjwY=";
-	  allowedIPs = ["10.100.0.19/32"];
-	}
->>>>>>> f246dff (add witu)
+	        allowedIPs = ["10.100.0.19/32"];
+	      }
       ];
     };
   };