fix e2e walkthrough test failures

apps/remix-ide/src/walkthroughService.js

@@ -6,13 +6,8 @@ export class WalkthroughService {
   }
 
   start (params) {
-<<<<<<< HEAD
     document.addEventListener('doWalkThrough', (e) => {
       if (!localStorage.getItem('hadTour_initial')) {
-=======
-    if (!localStorage.getItem('hadTour_initial')) {
-      document.addEventListener('doWalkThrough', (e) => {
->>>>>>> e0fcb6bcd (changes based on LianaHus comments complete)
         introJs().setOptions({
           steps: [{
             title: 'Welcome to Remix IDE',
@@ -52,13 +47,8 @@ export class WalkthroughService {
           }
         }).start()
         localStorage.setItem('hadTour_initial', true)
-<<<<<<< HEAD
       }
     })
-=======
-      })
-    }
->>>>>>> e0fcb6bcd (changes based on LianaHus comments complete)
   }
 
   startFeatureTour () {

libs/remix-ui/vertical-icons-panel/.eslintrc.json

@@ -16,8 +16,4 @@
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": "error"
   }
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> b6322066e (update components and setttings)

libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx

@@ -4,7 +4,8 @@ import React, {
   Fragment,
   useEffect,
   useReducer,
-  useRef
+  useRef,
+  useState
 } from 'react'
 
 import './remix-ui-vertical-icons-panel.css'
@@ -24,7 +25,7 @@ export function RemixUiVerticalIconsPanel ({
 }: RemixUiVerticalIconsPanelProps) {
   const scrollableRef = useRef<any>()
   const iconPanelRef = useRef<any>()
-  const udappPanelRef = useRef<any>()
+  // const [first] = useState(localStorage.getItem('firstTime'))
 
   function onThemeChanged (themeType: any) {
     const invert = themeType === 'dark' ? 1 : 0