diff --git a/lib/main.dart b/lib/main.dart
index d32a174..9d789c4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -42,14 +42,22 @@ void main() async {
   }
 
   await FirebaseMessagesController().requestFirebaseMessagingPermission();
+<<<<<<< HEAD
 
+=======
+  await FirebaseMessagesController().getToken();
+>>>>>>> 5fda73cd20f1ba88e87531dad334866c4ae87377
   LocationPermissions().locationPermissions();
   FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
 
   List<Future> initializationTasks = [
     FirebaseMessagesController().getNotificationSettings(),
+<<<<<<< HEAD
     // FirebaseMessagesController().getTokens(),
     FirebaseMessagesController().getToken(),
+=======
+    FirebaseMessagesController().getTokens(),
+>>>>>>> 5fda73cd20f1ba88e87531dad334866c4ae87377
     // Add more initialization tasks here
   ];