diff --git a/packages/dify-ui/src/themes/theme.css b/packages/dify-ui/src/themes/theme.css
index 1f9a273484..6fad0f39fd 100644
--- a/packages/dify-ui/src/themes/theme.css
+++ b/packages/dify-ui/src/themes/theme.css
@@ -816,10 +816,7 @@
 
   --color-dify-logo-blue: var(--color-dify-logo-blue);
   --color-dify-logo-black: var(--color-dify-logo-black);
-<<<<<<< HEAD
   --color-dify-logo-outline-1: var(--color-dify-logo-outline-1);
   --color-dify-logo-outline-2: var(--color-dify-logo-outline-2);
-=======
->>>>>>> feat/hitl-form-enhancement
 
 }