diff --git a/libs/remix-ui/vertical-icons-panel/.babelrc b/libs/remix-ui/vertical-icons-panel/.babelrc
index 09d67939cc..64a3748691 100644
--- a/libs/remix-ui/vertical-icons-panel/.babelrc
+++ b/libs/remix-ui/vertical-icons-panel/.babelrc
@@ -1,4 +1,4 @@
 {
   "presets": ["@nrwl/react/babel"],
   "plugins": []
-}
+}
\ No newline at end of file
diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/components/OtherIcons.tsx b/libs/remix-ui/vertical-icons-panel/src/lib/components/OtherIcons.tsx
index 377ca2c28a..09e38a567c 100644
--- a/libs/remix-ui/vertical-icons-panel/src/lib/components/OtherIcons.tsx
+++ b/libs/remix-ui/vertical-icons-panel/src/lib/components/OtherIcons.tsx
@@ -1,5 +1,6 @@
 /* eslint-disable no-use-before-define */
 /* eslint-disable @typescript-eslint/no-unused-vars */
+<<<<<<< HEAD
 import { VerticalIcons } from 'libs/remix-ui/vertical-icons-panel/types/vertical-icons-panel'
 import React from 'react'
 import Icon from './Icon'
@@ -48,6 +49,17 @@ function OtherIcons ({ verticalIconsPlugin, itemContextAction, addActive, remove
             />
           ))}
     </div>
+=======
+import React, { ReactNode } from 'react'
+
+interface OtherIconsProps {
+  children: ReactNode
+}
+
+function OtherIcons ({ children }: OtherIconsProps) {
+  return (
+    <div id="otherIcons">{ children }</div>
+>>>>>>> b6322066e (update components and setttings)
   )
 }
 
diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.module.css b/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.module.css
deleted file mode 100644
index e69de29bb2..0000000000