diff --git a/flake.nix b/flake.nix
index cd39709..f3e3390 100644
--- a/flake.nix
+++ b/flake.nix
@@ -308,8 +308,11 @@
           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;
         }