diff --git a/modules/services/coturn.nix b/modules/services/coturn.nix
index ea57f63..e6cb94d 100644
--- a/modules/services/coturn.nix
+++ b/modules/services/coturn.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  sops.secrets.coturn-auth-secret = {
+  sops.secrets.coturn_auth_secret = {
     sopsFile = ../../secrets/neo.yaml;
   };
 
@@ -12,7 +12,7 @@
     min-port = 49000;
     max-port = 50000;
     use-auth-secret = true;
-    static-auth-secret-file = config.sops.secrets.coturn-auth-secret.path;
+    static-auth-secret-file = config.sops.secrets.coturn_auth_secret.path;
     realm = "crans.org";
     cert = "/var/lib/acme/crans.org/full.pem";
     pkey = "/var/lib/acme/crans.org/key.pem";
diff --git a/modules/services/matrix.nix b/modules/services/matrix.nix
index 18bf9ad..e152b3b 100644
--- a/modules/services/matrix.nix
+++ b/modules/services/matrix.nix
@@ -15,13 +15,10 @@
     matrix_appservice_irc_db = {
       sopsFile = ../../secrets/neo.yaml;
     };
-<<<<<<< HEAD
 
     coturn_auth_secret = {
       sopsFile = ../../secrets/neo.yaml;
     };
-=======
->>>>>>> 8e15aad (Finalisation configuration matrix)
   };
 
   networking.firewall = {
@@ -104,10 +101,7 @@
         "turn:${config.services.coturn.realm}:3478?transport=udp"
         "turn:${config.services.coturn.realm}:3478?transport=tcp"
       ];
-<<<<<<< HEAD
       turn_shared_secret = config.sops.secrets.coturn_auth_secret.path;
-=======
->>>>>>> 8e15aad (Finalisation configuration matrix)
       turn_user_lifetime = "1h";
 
       app_service_config_files = [