diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.css b/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.css
index 1c0426e429..c4339942e1 100644
--- a/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.css
+++ b/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.css
@@ -83,11 +83,7 @@
     -ms-overflow-style: none;
   }
   .remixui_scrollable-container {
-<<<<<<< HEAD
     height: 540px;
-=======
-    max-height: 570px;
->>>>>>> aedb4fa83 (fix bug in icon removal in deactivation. Fix bottom border display regression)
     /* border-bottom: 3px solid #3f4455; */
   }
   .remixui_scrollbar::-webkit-scrollbar { /* Chrome, Safari and other Webkit browsers*/