diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix
index 6fe88b0d..c13676c8 100644
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -76,7 +76,6 @@ in
     file = ../secrets/discourse-secret-key-base.age;
     group = "users";
     owner = "discourse";
->>>>>>> 03012f56 ([NixOS] Fail to fix discourse-admin-password)
   };
 
   services.discourse = {