diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts
index 038ab076d..ae39054a8 100644
--- a/src/components/icons/index.ts
+++ b/src/components/icons/index.ts
@@ -1,5 +1,4 @@
 export { default as IconBuy } from './IconBuy'
-<<<<<<< HEAD
 export { default as ArrowUp } from './IconArrowUp'
 export { default as IconSearch } from './IconSearch'
 export { default as IconArrowRight } from './IconArrowRight'
@@ -9,7 +8,4 @@ export { default as IconInfo } from './IconInfo'
 export { default as IconHome } from './IconHome'
 export { default as IconShopping } from './IconShopping'
 export { default as IconHeart } from './IconHeart'
-=======
-export { default as IconHeart } from './IconHeart'
 export { default as IconVector } from './IconVector'
->>>>>>> 7d55bbf46e49a375575303f16ec393462c6c573d