diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 06dfbc98d..91ac2f850 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -62,24 +62,8 @@
           <span class="time">{{msg.duration}}</span>
         </div>
         <div>
-<<<<<<< HEAD
-          <ion-label>{{msg.msg}}</ion-label>
-          {{last ? scrollToBottom() : ''}}
-        </div>
-      </div>
-
-      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'
-        (click)="openPreview(msg)" *ngIf="msg.msg !=''">
-        <div class="title">
-          <ion-label>{{msg.u.name}}</ion-label>
-          <span class="time">{{msg.duration}}</span>
-        </div>
-        <div>
-          <ion-label>{{msg.msg}}</ion-label>
-=======
           <ion-label *ngIf="msg.delate == false">{{msg.msg}}</ion-label>
           <ion-label *ngIf="msg.delate == true">{{msg.msg}}</ion-label>
->>>>>>> c9af986ae8181cf24741ac7407264daea648d27e
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>