diff --git a/flake.nix b/flake.nix
index a8aa66e..8dd6e7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -329,11 +329,8 @@
           packages = [
             self.formatter.${system}
             nixpkgs.legacyPackages.${system}.deadnix
-<<<<<<< HEAD
             nixpkgs.legacyPackages.${system}.treefmt
             nixpkgs.legacyPackages.${system}.pre-commit
-=======
->>>>>>> 7502153 (fixes :))
           ];
           shellHook = (nix-pre-commit.lib.${system}.mkConfig { inherit pkgs config; }).shellHook;
         }