diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 2ce81826..3d8f0751 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -290,8 +290,6 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
 .text-bg-warning {
   background-color: #FED300 !important;
 }
-<<<<<<< HEAD
-=======
 
 .test_model>div {
   display: flex;
@@ -337,4 +335,3 @@ div:has(.o_required_modifier) > label::before {
   overflow: visible;
 }
 
->>>>>>> develop