diff --git a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
index 1508a21f8d..4bd92ee249 100644
--- a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
@@ -189,6 +189,7 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
   const debug = (txHash) => {
     startDebugging(null, txHash, null)
   }
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 const deleteHighlights = async () => {
@@ -200,6 +201,9 @@ const deleteHighlights = async () => {
   }
 >>>>>>> 1b1d8f0c7... modal dialog in react
 
+=======
+  
+>>>>>>> c941558da... fixing conflict
   const stepManager = {
     jumpTo: state.debugger && state.debugger.step_manager ? state.debugger.step_manager.jumpTo.bind(state.debugger.step_manager) : null,
     stepOverBack: state.debugger && state.debugger.step_manager ? state.debugger.step_manager.stepOverBack.bind(state.debugger.step_manager) : null,