diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 89d15ef7e..2df4678e0 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -24,10 +24,6 @@ import { Storage } from '@ionic/storage';
 import { EventsService } from 'src/app/services/events.service';
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 
-<<<<<<< HEAD
-
-=======
->>>>>>> migraCapacitor
 @Component({
   selector: 'app-home',
   templateUrl: './home.page.html',
@@ -87,11 +83,7 @@ export class HomePage implements OnInit {
     private offlinemanager: OfflineManagerService,
     private storage: Storage,
     private eventservice: EventsService,
-<<<<<<< HEAD
-    private screenOrientation: ScreenOrientation) {
-=======
     private screenOrientation: ScreenOrientation,) {
->>>>>>> migraCapacitor
 
     /* this.webNotificationPopupService.askNotificationPermission() */
 
@@ -121,22 +113,13 @@ export class HomePage implements OnInit {
 
   ngOnInit() {
 
-<<<<<<< HEAD
-    this.notificationsService.onReceviNotification();
-=======
     this.notificationsService.onReciveForeground();
     this.notificationsService.onReciveBackground();
->>>>>>> migraCapacitor
 
     window.addEventListener('online', () => {
       console.log('Became online')
       this.backgroundservice.online()
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-<<<<<<< HEAD
-        this.webnotification.webconnection();
-=======
-
->>>>>>> migraCapacitor
       } else {
         /* this.notificationsService.onReceviNotification(); */
         this.offlinemanager.synchnize()