merge: fix conflict

src/components/common/Layout/Layout.tsx

@@ -2,7 +2,6 @@ import { CommerceProvider } from '@framework'
 import { useRouter } from 'next/router'
 import { FC } from 'react'
 import { useModalCommon } from 'src/components/hooks'
-import { CartDrawer } from '..'
 import Footer from '../Footer/Footer'
 import Header from '../Header/Header'
 import s from './Layout.module.scss'
@@ -30,9 +29,6 @@ const Layout: FC<Props> = ({ children }) => {
                 <Header />
                 <main >{children}</main>
                 <button onClick={toggle}>toggle card: {visibleCartDrawer.toString()}</button>
-                <CartDrawer
-                    visible={visibleCartDrawer}
-                    onClose={closeCartDrawer} />
                 <Footer />
             </div>
         </CommerceProvider>