diff --git a/requirements.txt b/requirements.txt
index 8c1946f3d..446020a1c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,10 @@
+<<<<<<< Updated upstream
 comfyui-frontend-package==1.28.9
 comfyui-workflow-templates==0.3.1
+=======
+comfyui-frontend-package==1.28.8
+comfyui-workflow-templates==0.6.0
+>>>>>>> Stashed changes
 comfyui-embedded-docs==0.3.1
 torch
 torchsde