diff --git a/flake.nix b/flake.nix
index 8463ee5..f15805a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,11 +46,8 @@
                         .venv/bin/pip install -r ./app/requirements.txt
                         source .venv/bin/activate
                     fi
-<<<<<<< HEAD
-=======
 
                     export YTDLP_BIN=${pkgs.lib.getExe pkgs.yt-dlp}
->>>>>>> v1-refactor
                 '';
             };
         });