Remove conflict

src/components/common/SelectCommon/SelectCommon.tsx

@@ -35,10 +35,6 @@ const SelectCommon = ({ type = 'default', size = 'base', option, children }: Pro
         setActive(!isActive)
     }
 
-    const changeSelectedName = (props:string) => {
-        setSelectedName(props)
-    }
-
     return(
         <>
             <div className={classNames({
@@ -68,7 +64,7 @@ const SelectCommon = ({ type = 'default', size = 'base', option, children }: Pro
                                 [s.selectOption] : true,
                                 [s[size]] : !!size,
                             })}
-                                onClick = { changeSelectedName!.(item.name) }
+                                onClick = { () => setSelectedName(item.name) }
                             >{item.name}</div>
                         )
                     }

src/components/icons/index.ts

@@ -9,13 +9,10 @@ export { default as IconHome } from './IconHome'
 export { default as IconShopping } from './IconShopping'
 export { default as IconHeart } from './IconHeart'
 export { default as IconVector } from './IconVector'
-<<<<<<< HEAD
 export { default as IconVectorDown } from './IconVectorDown'
-=======
 export { default as IconFacebookColor } from './IconFacebookColor'
 export { default as IconGoogleColor } from './IconGoogleColor'
 export { default as IconApple } from './IconApple'
 export { default as ArrowLeft } from './ArrowLeft'
 export { default as ArrowRight } from './ArrowRight'
 export { default as Close } from './Close'
->>>>>>> 08cd011b5ebb28ba4205d167dc07c81e3b9c3072