diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 23a5b78f3..fd8294ba2 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -62,13 +62,13 @@
           <ion-label *ngIf="msg.delate == true">{{msg.msg}}</ion-label>
 
           <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
             <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
             <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-            <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-            <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+            <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+            <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
           </ion-label>
           {{last ? scrollToBottom() : ''}}
         </div>
@@ -103,13 +103,13 @@
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image" >
                 <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                 <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-                  <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                  <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                   <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                   <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                   <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                   <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                  <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                  <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                  <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+                  <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
                 </ion-label>
               </div>
               <div *ngIf="msg.file.type != 'application/img'">
@@ -159,13 +159,13 @@
                     </ion-label>
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
                       
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                       <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                       <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                      <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                      <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()"> Tentar</div>
+                      <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+                      <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()"> Tentar</div>
                     </ion-label>
                   </div>
               </div>
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 573cdb045..0af96090a 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -45,7 +45,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   room: any;
   roomName: any;
-  members: any;
+  members: any = []
   contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
   allUsers: any[] = [];
 
@@ -143,6 +143,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.getChatMembers();
 
     this.getRoomMessageDB(this.roomId);
+    this.getGroupContacts({});
     
   }
 
@@ -615,6 +616,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async bookMeeting() {
+
+    this.getGroupContacts({});
     this.attendees = this.members.map((val) => {
       return {
         Name: val.name,
@@ -623,23 +626,21 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
     });
     
-    this.popoverController.dismiss();
-    if (window.innerWidth <= 1024) {
-      const modal = await this.modalController.create({
-        component: NewEventPage,
-        componentProps: {
-          attendees: this.attendees,
-        },
-        cssClass: 'modal  modal-desktop',
-        backdropDismiss: false
-      });
-      await modal.present();
-      modal.onDidDismiss().then((data) => {
-        if (data) {
+    // this.popoverController.dismiss();
+    const modal = await this.modalController.create({
+      component: NewEventPage,
+      componentProps: {
+        attendees: this.attendees,
+      },
+      cssClass: 'modal  modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((data) => {
+      if (data) {
 
-        }
-      });
-    }
+      }
+    });
   }
 
 
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index f626c951b..2a6e6dc2e 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -60,13 +60,13 @@
 
               <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
-                <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                 <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                 <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                 <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                 <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+                <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
               </ion-label>
             </div>
           {{last ? scrollToBottom() : ''}}
@@ -99,13 +99,13 @@
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
                 
                 <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-                  <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                  <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                   <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                   <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                   <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                   <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                  <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                  <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                  <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+                  <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
                 </ion-label>
               
               </div>
@@ -165,13 +165,13 @@
 
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
                     
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                       <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                       <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                      <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                      <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                      <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+                      <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
                     </ion-label>
                     
                   </div>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 36dbc6172..2c6854b6e 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -59,13 +59,13 @@
 
           <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
-            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
             <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
             <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-            <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-            <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+            <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+            <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
           </ion-label>
           {{last ? scrollToBottom() : ''}}
         </div>
@@ -108,13 +108,13 @@
                     <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                       <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                       <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                      <span class="lido" *ngIf="msg.viewed.length >= 1" >Lido</span>
-                      <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()"> Tentar</div>
+                      <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" >Lido</span>
+                      <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()"> Tentar</div>
                     </ion-label>
 
                   </div>
@@ -165,13 +165,13 @@
                         </ion-label>
                         <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
-                          <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                          <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                           <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                           <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                           <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                           <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                          <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                          <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                          <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+                          <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
                         </ion-label>
                     </div>
                   </div>
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html
index 11b11f721..839f9ea23 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.html
+++ b/src/app/shared/chat/messages/contacts/contacts.page.html
@@ -9,7 +9,7 @@
         </div>
         <div class="div-title">
           <!-- Desktop -->
-          <ion-label class="title">Nova Conversas</ion-label>
+          <ion-label class="title">Nova Conversa</ion-label>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 0662e54b7..884abe7a0 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -60,13 +60,13 @@
           <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
             
             
-            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
             <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
             <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
             <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-            <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-            <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+            <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+            <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
           </ion-label>
           {{last ? scrollToBottom() : ''}}
         </div>
@@ -106,13 +106,13 @@
                   <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
                   <ion-label class="float-status-all float-status"  *ngIf="msg.u.username==sessionStore.user.UserName">
                     
-                    <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                    <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                     <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                     <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                     <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                     <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                    <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                    <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                    <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+                    <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
                   </ion-label>
                 </div>
                 <div *ngIf="msg.file.type != 'application/img'">
@@ -174,13 +174,13 @@
                     </ion-label>
                     <ion-label class="float-status-all float-status"  *ngIf="msg.u.username==sessionStore.user.UserName">
                       
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado"> Enviado</span>
+                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
                       <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> --> 
                       <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
                       <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                      <span class="lido" *ngIf="msg.viewed.length >= 1" > Lido</span>
-                      <div *ngIf="msg.manualRetry" class="try" (click)="msg.send()">Tentar</div>
+                      <span class="lido pl-10" *ngIf="msg.viewed.length >= 1" > Lido</span>
+                      <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
                     </ion-label>
                   </div>
                 </div>
diff --git a/version/git-version.ts b/version/git-version.ts
index 5fdb95c68..4a9db22a3 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "b21a3350e",
-  "SHA": "b21a3350ec5135e0be63566be04f5599127044fd",
+  "shortSHA": "5a90b2125",
+  "SHA": "5a90b212525d1fdc1cb7df8e13b81fc666fcbe4a",
   "branch": "no_bug_movemente",
-  "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 13 19:35:16 2023 +0100'",
-  "lastCommitMessage": "merge",
-  "lastCommitNumber": "4778",
+  "lastCommitAuthor": "'Eudes Inácio'",
+  "lastCommitTime": "'Mon Feb 13 19:46:44 2023 +0100'",
+  "lastCommitMessage": "pull made",
+  "lastCommitNumber": "4779",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified:   src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/pages/chat/messages/messages.page.html\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified:   src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified:   src/app/shared/chat/messages/messages.page.html",
   "changeAuthor": "eudes.inacio"
 }
\ No newline at end of file