diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 95f05fae01..5956bfa4a5 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -98,8 +98,8 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               run(data, source, file)
             }
           }
-        )
-      }
+        }
+      )
     }
     return () => { }
   }, [autoRun, categoryIndex, state])
@@ -326,10 +326,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
     <div className="analysis_3ECCBV px-3 pb-1">
       <div className="my-2 d-flex flex-column align-items-left">
         <div className="d-flex justify-content-between" id="staticanalysisButton">
-<<<<<<< HEAD
         <div className="d-flex justify-content-between">
-=======
->>>>>>> 691f449c6 (fix editor highlighter)
           <RemixUiCheckbox
             id="checkAllEntries"
             inputType="checkbox"