resolve merge conflict

mobile/lib/modules/home/ui/home_page_app_bar.dart

@@ -1,5 +1,4 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:badges/badges.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
@@ -29,7 +28,6 @@ class HomePageAppBar extends ConsumerWidget with PreferredSizeWidget {
     final ServerInfoState serverInfoState = ref.watch(serverInfoProvider);
 
     return AppBar(
-      centerTitle: true,
       backgroundColor: Theme.of(context).appBarTheme.backgroundColor,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.all(
@@ -44,10 +42,9 @@ class HomePageAppBar extends ConsumerWidget with PreferredSizeWidget {
                 top: 5,
                 child: IconButton(
                   splashRadius: 25,
-                  icon: Icon(
+                  icon: const Icon(
                     Icons.face_outlined,
                     size: 30,
-                    color: Theme.of(context).primaryColor,
                   ),
                   onPressed: () {
                     Scaffold.of(context).openDrawer();
@@ -112,16 +109,13 @@ class HomePageAppBar extends ConsumerWidget with PreferredSizeWidget {
               splashRadius: 25,
               iconSize: 30,
               icon: isEnableAutoBackup
-                  ? Icon(
+                  ? const Icon(
                       Icons.backup_rounded,
-                      color: Theme.of(context).primaryColor,
                     )
                   : Badge(
                       padding: const EdgeInsets.all(4),
-                      elevation: 3,
-                      position: BadgePosition.bottomEnd(bottom: -4, end: -4),
-                      badgeColor: Colors.white,
-                      badgeContent: const Icon(
+                      backgroundColor: Colors.white,
+                      label: const Icon(
                         Icons.cloud_off_rounded,
                         size: 8,
                         color: Colors.indigo,