Fixe merge conflit

src/app/pages/search/sender/sender.page.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
-
+import { ContactsService } from 'src/app/services/contacts.service';
+import { EventPerson } from  'src/app/models/eventperson.model';
 @Component({
   selector: 'app-sender',
   templateUrl: './sender.page.html',
@@ -9,9 +10,37 @@ import { ModalController } from '@ionic/angular';
 })
 export class SenderPage implements OnInit {
 
-  constructor(private modalController:ModalController) { }
+  contacts: EventPerson[];
+  showContacts: EventPerson[];
+
+
+  constructor(private modalController:ModalController,
+    private ContactsService: ContactsService) { 
+
+    }
 
   ngOnInit() {
+    this.getSender();
+  }
+
+  getSender(){
+    this.ContactsService.getContacts("").subscribe(res=>{
+      this.contacts = res;
+    });
+  }
+
+  filterContact(findName){
+    console.log(findName)
+    // const persons = this.contacts.filter((person) => {
+
+      // if (person.Name.indexOf(findName) == 0){
+        // return true;
+      // }
+
+    // });
+
+    // this.showContacts = persons;
+
   }
 
   close(){