diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts
index 586ff3cb7..70575e11d 100644
--- a/src/components/icons/index.ts
+++ b/src/components/icons/index.ts
@@ -33,9 +33,6 @@ export { default as IconMinus } from './IconMinus'
 export { default as IconCirclePlus } from './IconCirclePlus'
 export { default as IconDoneCheckout } from './IconDoneCheckout'
 export { default as IconFilter } from './IconFilter'
-<<<<<<< HEAD
 export { default as IconBell } from './IconBell'
 export { default as IconBill } from './IconBill'
-=======
 export { default as IconNoti } from './IconNoti'
->>>>>>> 83b5f9048687e555a978ae71e26a1d19aac2247c
diff --git a/src/components/modules/Notification/NotificationItem/NotificationItem.module.scss b/src/components/modules/Notification/NotificationItem/NotificationItem.module.scss
index 38ce184d1..ca7531981 100644
--- a/src/components/modules/Notification/NotificationItem/NotificationItem.module.scss
+++ b/src/components/modules/Notification/NotificationItem/NotificationItem.module.scss
@@ -2,13 +2,14 @@
 
 .notificationItem {
     @apply flex flex-row;
+    padding-top: 1.2rem;
     padding-left: 1.6rem;
-    padding-bottom: 1.4rem;
     &:hover{
         cursor: pointer;
     }
     .contentWrapper {
         padding-left: 1.6rem;
+        padding-bottom: 1.4rem;
         max-width: 26.3rem;
         .title {
             font-weight: bold;