diff --git a/lib/core/config/dependencies.dart b/lib/core/config/dependencies.dart
index 6f0533c..d377d11 100644
--- a/lib/core/config/dependencies.dart
+++ b/lib/core/config/dependencies.dart
@@ -1,14 +1,11 @@
 import 'package:provider/provider.dart';
 import 'package:provider/single_child_widget.dart';
 import 'package:tm_app/core/theme/theme_provider.dart';
-<<<<<<< HEAD
 import 'package:tm_app/data/repositories/home_repository.dart';
-import 'package:tm_app/data/services/home_service.dart';
-=======
 import 'package:tm_app/data/repositories/tender_detail_repository.dart';
+import 'package:tm_app/data/services/home_service.dart';
 import 'package:tm_app/data/services/tender_detail_service.dart';
 import 'package:tm_app/view_models/tender_detail_view_model.dart';
->>>>>>> origin/refactor_dark_mood_repository
 
 import '../../data/repositories/auth_repository.dart';
 import '../../data/services/auth_service.dart';
@@ -31,16 +28,21 @@ List<SingleChildWidget> get apiClients {
   return [
     Provider(create: (context) => AuthService(networkManager: context.read())),
     Provider(create: (context) => HomeService(networkManager: context.read())),
-    Provider(create: (context) => TenderDetailService(networkManager: context.read())),
+    Provider(
+      create: (context) => TenderDetailService(networkManager: context.read()),
+    ),
   ];
-    
 }
 
 List<SingleChildWidget> get repositories {
   return [
     Provider(create: (context) => AuthRepository(authService: context.read())),
     Provider(create: (context) => HomeRepository(homeService: context.read())),
-    Provider(create: (context) => TenderDetailRepository(tenderDetailService: context.read())),
+    Provider(
+      create:
+          (context) =>
+              TenderDetailRepository(tenderDetailService: context.read()),
+    ),
   ];
 }
 
@@ -51,11 +53,12 @@ List<SingleChildWidget> get viewModels {
     ),
     ChangeNotifierProvider(
       create: (context) => HomeViewModel(homeRepository: context.read()),
-        
     ),
     ChangeNotifierProvider(
-      create: (context) => TenderDetailViewModel(tenderDetailRepository: context.read()),
-        ),
+      create:
+          (context) =>
+              TenderDetailViewModel(tenderDetailRepository: context.read()),
+    ),
   ];
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 1b0645d..cc02d09 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,11 +29,8 @@ dev_dependencies:
   flutter_gen_runner:
   build_runner: ^2.5.4
   go_router_builder: ^3.0.0
-<<<<<<< HEAD
-  json_serializable: ^6.9.5
-=======
   json_serializable: ^6.7.1
->>>>>>> origin/refactor_dark_mood_repository
+
 
 
 flutter: