diff --git a/requirements.txt b/requirements.txt
index 5a7513f1f..336ec9d57 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,6 @@
 comfyui-frontend-package==1.21.7
-<<<<<<< Bump-template-to-0.1.28
 comfyui-workflow-templates==0.1.28
-comfyui-embedded-docs==0.2.0
-=======
-comfyui-workflow-templates==0.1.25
 comfyui-embedded-docs==0.2.2
->>>>>>> master
 torch
 torchsde
 torchvision