diff --git a/dialer/lib/services/call_service.dart b/dialer/lib/services/call_service.dart
index 26307be..43d34e4 100644
--- a/dialer/lib/services/call_service.dart
+++ b/dialer/lib/services/call_service.dart
@@ -2,7 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import '../features/call/call_page.dart';
 import '../features/call/incoming_call_page.dart';
+<<<<<<< HEAD
 import '../services/contact_service.dart';
+=======
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
 
 class CallService {
   static const MethodChannel _channel = MethodChannel('call_service');
@@ -10,16 +13,25 @@ class CallService {
   static String? currentDisplayName;
   static Uint8List? currentThumbnail;
   static bool _isCallPageVisible = false;
+<<<<<<< HEAD
   static String? _currentCallState;
   static Map<String, dynamic>? _pendingCall;
   static bool wasPhoneLocked = false;
   final ContactService _contactService = ContactService();
+=======
+  static Map<String, dynamic>? _pendingCall;
+  static bool wasPhoneLocked = false;
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
 
   static final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 
   CallService() {
     _channel.setMethodCallHandler((call) async {
+<<<<<<< HEAD
       print('CallService: Received method ${call.method} with args ${call.arguments}');
+=======
+      print('CallService: Handling method call: ${call.method}');
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
       switch (call.method) {
         case "callAdded":
           final phoneNumber = call.arguments["callId"] as String;
@@ -27,13 +39,35 @@ class CallService {
           currentPhoneNumber = phoneNumber.replaceFirst('tel:', '');
           await _fetchContactInfo(currentPhoneNumber!);
           print('CallService: Call added, number: $currentPhoneNumber, state: $state');
+<<<<<<< HEAD
           _handleCallState(state);
+=======
+          if (state == "ringing") {
+            _handleIncomingCall(phoneNumber);
+          } else {
+            _navigateToCallPage();
+          }
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
           break;
         case "callStateChanged":
           final state = call.arguments["state"] as String;
           wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
           print('CallService: State changed to $state, wasPhoneLocked: $wasPhoneLocked');
+<<<<<<< HEAD
           _handleCallState(state);
+=======
+          if (state == "disconnected" || state == "disconnecting") {
+            _closeCallPage();
+            if (wasPhoneLocked) {
+              _channel.invokeMethod("callEndedFromFlutter");
+            }
+          } else if (state == "active" || state == "dialing") {
+            _navigateToCallPage();
+          } else if (state == "ringing") {
+            final phoneNumber = call.arguments["callId"] as String;
+            _handleIncomingCall(phoneNumber.replaceFirst('tel:', ''));
+          }
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
           break;
         case "callEnded":
         case "callRemoved":
@@ -56,10 +90,18 @@ class CallService {
           print('CallService: Incoming call from notification: $phoneNumber, wasPhoneLocked: $wasPhoneLocked');
           _handleIncomingCall(phoneNumber);
           break;
+        case "incomingCallFromNotification":
+          final phoneNumber = call.arguments["phoneNumber"] as String;
+          wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
+          currentPhoneNumber = phoneNumber;
+          print('CallService: Incoming call from notification: $phoneNumber, wasPhoneLocked: $wasPhoneLocked');
+          _handleIncomingCall(phoneNumber);
+          break;
       }
     });
   }
 
+<<<<<<< HEAD
   Future<void> _fetchContactInfo(String phoneNumber) async {
     try {
       final contacts = await _contactService.fetchContacts();
@@ -86,6 +128,8 @@ class CallService {
     return number.replaceAll(RegExp(r'[\s\-\(\)]'), '');
   }
 
+=======
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
   void _handleIncomingCall(String phoneNumber) {
     final context = navigatorKey.currentContext;
     if (context == null) {
@@ -112,6 +156,7 @@ class CallService {
     }
   }
 
+<<<<<<< HEAD
   void _handleCallState(String state) {
     final context = navigatorKey.currentContext;
     if (context == null) {
@@ -145,6 +190,20 @@ class CallService {
       Navigator.pop(context);
     }
     Navigator.pushReplacement(
+=======
+  void _navigateToCallPage() {
+    final context = navigatorKey.currentContext;
+    if (context == null) {
+      print('CallService: Cannot navigate to CallPage, context is null');
+      return;
+    }
+    if (_isCallPageVisible) {
+      print('CallService: CallPage already visible, skipping navigation');
+      return;
+    }
+    print('CallService: Navigating to CallPage');
+    Navigator.push(
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
       context,
       MaterialPageRoute(
         settings: const RouteSettings(name: '/call'),
@@ -157,14 +216,19 @@ class CallService {
     ).then((_) {
       print('CallService: CallPage popped');
       _isCallPageVisible = false;
+      print('CallService: CallPage popped, _isCallPageVisible set to false');
     });
     _isCallPageVisible = true;
   }
 
   void _navigateToIncomingCallPage(BuildContext context) {
+<<<<<<< HEAD
     final currentRoute = ModalRoute.of(context)?.settings.name;
     print('CallService: Navigating to IncomingCallPage. Visible: $_isCallPageVisible, Current Route: $currentRoute');
     if (_isCallPageVisible && currentRoute == '/incoming_call') {
+=======
+    if (_isCallPageVisible) {
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
       print('CallService: IncomingCallPage already visible, skipping navigation');
       return;
     }
@@ -185,6 +249,7 @@ class CallService {
     ).then((_) {
       print('CallService: IncomingCallPage popped');
       _isCallPageVisible = false;
+      print('CallService: IncomingCallPage popped, _isCallPageVisible set to false');
     });
     _isCallPageVisible = true;
   }
@@ -193,23 +258,35 @@ class CallService {
     final context = navigatorKey.currentContext;
     if (context == null) {
       print('CallService: Cannot close page, context is null');
+<<<<<<< HEAD
       return;
     }
     print('CallService: Attempting to close call page. Visible: $_isCallPageVisible');
     if (!_isCallPageVisible) {
       print('CallService: CallPage not visible, skipping pop');
+=======
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
       return;
     }
+    print('CallService: Closing call page, _isCallPageVisible: $_isCallPageVisible');
     if (Navigator.canPop(context)) {
+<<<<<<< HEAD
       print('CallService: Popping CallPage. Current Route: ${ModalRoute.of(context)?.settings.name}');
       Navigator.pop(context);
       _isCallPageVisible = false;
     } else {
       print('CallService: Cannot pop, no routes to pop');
+=======
+      print('CallService: Popping call page');
+      Navigator.pop(context);
+      _isCallPageVisible = false;
+    } else {
+      print('CallService: No page to pop');
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
     }
   }
 
-  Future<void> makeGsmCall(
+  Future<Map<String, dynamic>> makeGsmCall(
     BuildContext context, {
     required String phoneNumber,
     String? displayName,
@@ -225,40 +302,47 @@ class CallService {
       print('CallService: Making GSM call to $phoneNumber');
       final result = await _channel.invokeMethod('makeGsmCall', {"phoneNumber": phoneNumber});
       print('CallService: makeGsmCall result: $result');
-      if (result["status"] != "calling") {
+      final resultMap = Map<String, dynamic>.from(result as Map);
+      if (resultMap["status"] != "calling") {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text("Failed to initiate call")),
         );
         return;
       }
+<<<<<<< HEAD
       _handleCallState("dialing");
+=======
+      return resultMap;
+>>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
     } catch (e) {
       print("CallService: Error making call: $e");
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(content: Text("Error making call: $e")),
       );
-      rethrow;
+      return {"status": "error", "message": e.toString()};
     }
   }
 
-  Future<void> hangUpCall(BuildContext context) async {
+  Future<Map<String, dynamic>> hangUpCall(BuildContext context) async {
     try {
       print('CallService: Hanging up call');
       final result = await _channel.invokeMethod('hangUpCall');
       print('CallService: hangUpCall result: $result');
-      if (result["status"] != "ended") {
+      final resultMap = Map<String, dynamic>.from(result as Map);
+      if (resultMap["status"] != "ended") {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text("Failed to end call")),
         );
       } else {
         _closeCallPage();
       }
+      return resultMap;
     } catch (e) {
       print("CallService: Error hanging up call: $e");
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(content: Text("Error hanging up call: $e")),
       );
-      rethrow;
+      return {"status": "error", "message": e.toString()};
     }
   }
 }
\ No newline at end of file