diff --git a/src/hooks/useContextMenu.js b/src/hooks/useContextMenu.js
index b9b1f9bd..8f5bb189 100644
--- a/src/hooks/useContextMenu.js
+++ b/src/hooks/useContextMenu.js
@@ -43,12 +43,9 @@ import { useTrestle } from './module/useTrestle'
 import { useCircuitTrestle } from './useCirCuitTrestle'
 import { usePolygon } from '@/hooks/usePolygon'
 import { useText } from '@/hooks/useText'
-<<<<<<< HEAD
 import { useUndoRedo } from '@/hooks/useUndoRedo'
-=======
 import { POLYGON_TYPE } from '@/common/common'
 import { debugCapture } from '@/util/debugCapture'
->>>>>>> e1e6be28d160ca24094e508ee77f91b9896fa72e
 
 export function useContextMenu() {
   const canvas = useRecoilValue(canvasState)