diff --git a/components/common/Layout/Layout.tsx b/components/common/Layout/Layout.tsx
index c8ad662e1..ff8467a23 100644
--- a/components/common/Layout/Layout.tsx
+++ b/components/common/Layout/Layout.tsx
@@ -8,15 +8,11 @@ import { Navbar, Footer } from '@components/common'
 import { useAcceptCookies } from '@lib/hooks/useAcceptCookies'
 import { Sidebar, Button, Modal, LoadingDots } from '@components/ui'
 import { CartSidebarView } from '@components/cart'
-<<<<<<< HEAD
-import LoginView from '@components/auth/LoginView'
-import { CommerceProvider } from '@bigcommerce/storefront-data-hooks'
-import type { Page } from '@bigcommerce/storefront-data-hooks/api/operations/get-all-pages'
-=======
 
+import LoginView from '@components/auth/LoginView'
 import { CommerceProvider } from '@framework'
 import type { Page } from '@framework/api/operations/get-all-pages'
->>>>>>> 79269edbd3b96eecdc3b96b7c671670ddb74bb3b
+
 
 const Loading = () => (
   <div className="w-80 h-80 flex items-center text-center justify-center p-3">
diff --git a/components/ui/Modal/Modal.tsx b/components/ui/Modal/Modal.tsx
index 070ddea63..c3b0c8df2 100644
--- a/components/ui/Modal/Modal.tsx
+++ b/components/ui/Modal/Modal.tsx
@@ -39,7 +39,7 @@ const Modal: FC<Props> = ({ children, open, onClose, onEnter = null }) => {
       window.removeEventListener('keydown', handleKey)
       clearAllBodyScrollLocks()
     }
-  }, [open])
+  }, [open, handleKey])
 
   return (
     <Portal>