chore: merge fixes

Author: xsahil03x

melos.yaml

@@ -24,10 +24,14 @@ command:
       dio: ^5.9.0
       equatable: ^2.0.5
       flutter_state_notifier: ^1.0.0
+      flutter_svg: ^2.2.0
       freezed_annotation: ^3.0.0
       get_it: ^8.0.3
+      google_fonts: ^6.3.0
+      injectable: ^2.5.1
       http: ^1.1.0
       intl: ">=0.18.1 <=0.21.0"
+      jiffy: ^6.4.3
       json_annotation: ^4.9.0
       meta: ^1.9.1
       retrofit: ^4.6.0
@@ -47,6 +51,7 @@ command:
       auto_route_generator: ^10.0.0
       build_runner: ^2.4.15
       freezed: ^3.0.0
+      injectable_generator: ^2.7.0
       json_serializable: ^6.9.5
       mocktail: ^1.0.4
       retrofit_generator: ^9.6.0

packages/stream_feeds/lib/src/state/activity_state.freezed.dart

@@ -52,7 +52,8 @@ class BookmarkFolderList extends Disposable {
   /// Queries the initial list of bookmark folders based on the provided [BookmarkFoldersQuery].
   ///
   /// Returns a [Result] containing a list of [BookmarkFolderData] or an error.
-  Future<Result<List<BookmarkFolderData>>> get() => _queryBookmarkFolders(query);
+  Future<Result<List<BookmarkFolderData>>> get() =>
+      _queryBookmarkFolders(query);
 
   /// Loads more bookmark folders based on the current pagination state.
   ///