🔀 merge:Merge branch 'common' of github.com:KieIO/grocery-vercel-commerce into m2-datnguyen

:%s

src/components/common/ButtonCommon/ButtonCommon.module.scss

@@ -65,14 +65,8 @@
   }
 
   &.ghost {
-<<<<<<< HEAD
-    @apply bg-white;
-    color: var(--text-active);
-    border: 1px solid var(--text-active);
-=======
     @apply bg-white text-primary;
     border: 1px solid var(--primary);
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
     &.loading {
       &::before {
         border-top-color: var(--text-active);

src/components/modules/home/index.ts

@@ -1,8 +1,5 @@
 export { default as HomeBanner } from './HomeBanner/HomeBanner'
-<<<<<<< HEAD
 export { default as CollectionCarcoucel } from './CollectionCarcoucel/CollectionCarcoucel'
-=======
 export { default as HomeCTA } from './HomeCTA/HomeCTA'
 export { default as HomeSubscribe } from './HomeSubscribe/HomeSubscribe'
 export { default as HomeVideo } from './HomeVideo/HomeVideo'
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d