diff --git a/flake.nix b/flake.nix
index bc25b18a..a5a890f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,12 +54,9 @@
     nixos-hardware,
     agenix,
     deploy,
-<<<<<<< HEAD
+    nvfetcher,
     triton-vmtools,
     keycloak-theme-pub-solar,
-=======
-    nvfetcher,
->>>>>>> main
     ...
   } @ inputs:
     digga.lib.mkFlake