Fix build error

lib/features/base/base_controller.dart

@@ -122,8 +122,8 @@ abstract class BaseController extends GetxController
           log('BaseController::onData(): $success');
           _getSubscriptionLocalAction();
         } else if (success is GetFCMSubscriptionLocalSuccess) {
-          final _subscriptionId = success.fcmSubscription.subscriptionId;
+          final subscriptionId = success.fcmSubscription.subscriptionId;
-          _destroySubscriptionAction(_subscriptionId);
+          _destroySubscriptionAction(subscriptionId);
         } else if (success is DestroySubscriptionSuccess) {
           checkAuthenticationTypeWhenLogout();
         }

lib/features/base/reloadable/reloadable_controller.dart

@@ -55,14 +55,6 @@ abstract class ReloadableController extends BaseController {
           _handleGetSessionSuccess(success);
         } else if (success is GetStoredTokenOidcSuccess) {
           _handleGetStoredTokenOIDCSuccess(success);
-<<<<<<< HEAD
-        } else if (success is GetFCMSubscriptionLocalSuccess) {
-          final subscriptionId = success.fcmSubscription.subscriptionId;
-          _destroySubscriptionAction(subscriptionId);
-        } else if (success is DestroySubscriptionSuccess) {
-          _checkAuthenticationTypeWhenLogout();
-=======
->>>>>>> d49ace46 (Move logout logic to BaseController to handle logout when BadCredentials for all cases)
         }
       }
     );

lib/features/thread/presentation/thread_controller.dart

@@ -337,7 +337,7 @@ class ThreadController extends BaseController with EmailActionController {
   void _handleErrorGetAllOrRefreshChangesEmail(dynamic error) async {
     logError('ThreadController::_handleErrorGetAllOrRefreshChangesEmail():Error: $error');
     if (error is CannotCalculateChangesMethodResponseException) {
-      await _cachingManager.clearEmailCache();
+      await cachingManager.clearEmailCache();
       _getAllEmailAction();
     } else {
       super.onError(error);

prebuild.sh

@@ -5,7 +5,7 @@ set -e
 set -x
 
 cd core
-flutter pub get
+#flutter pub get
 
 ## Install necessary pods
 #cd ../ios