diff --git a/src/app/commons/component/layout/notification/app.notification.component.html b/src/app/commons/component/layout/notification/app.notification.component.html
index c10e2fa..7b7873f 100644
--- a/src/app/commons/component/layout/notification/app.notification.component.html
+++ b/src/app/commons/component/layout/notification/app.notification.component.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <div class="ui-g-12 ui-bottom-border-1">
     Notifications
 </div>
@@ -14,20 +13,3 @@
         <span>View All</span>
     </a>
 </li>
-=======
-<div class="ui-g ui-g-12 ui-g-nopad ui-app-noti">
-    <h4>No tifications</h4>
-    <li role="menuitem" *ngFor="let noti of notifications; let i = index">
-        <a *ngIf="i < 5" href="javascript:void(0)" class="topbar-message" (click)="onNotiClick(noti)" [ngStyle]="noti.confirmDate ? '' : {'background-color': 'lightblue'}">
-            <div class="ui-app-noti-date">{{noti.createDate | date: 'short'}}</div>
-            <div class="ui-app-noti-title">{{noti.title}}</div>
-            <div class="ui-app-noti-content">{{noti.message}}</div>
-        </a>
-    </li>
-    <li>
-        <a href="javascript:void(0)" (click)="onViewAllClick(noti)">
-            <span>View All</span>
-        </a>
-    </li>
-</div>
->>>>>>> c5e1b49b5336780bfe65a1db9a07a5643f2881c0