chore: fix merge problems 2

Author: SeoHyeonSim

pubspec.yaml

@@ -66,12 +66,14 @@ dependencies:
   get_it: ^8.0.3
   injectable: ^2.5.0
   flutter_bloc: ^8.1.6
+
+  sqlite3_flutter_libs: ^0.5.27
   dotted_border: ^2.1.0
   workmanager: ^0.5.2
   flutter_background: ^1.3.0+1
   intl: ^0.20.1
   dotted_line: ^3.2.3
-  sqlite3_flutter_libs: ^0.5.27
+
 
 
 dev_dependencies:
@@ -109,6 +111,13 @@ flutter:
 
   assets:
     - assets/check.svg
+    - assets/drag_indicator.svg
+    - assets/bell.svg
+    - assets/friends.svg
+    - assets/character.png
+    - assets/arrow_right.svg
+    - assets/meatballs.svg
+    - lib/images/
 
   # To add assets to your application, add an assets section, like this:
   # assets:

widgetbook/pubspec.lock

@@ -324,7 +324,10 @@ packages:
     source: hosted
     version: "8.0.0"
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> d1a998a5890903d19840cc57459893405cae2ab0
   flutter_bloc:
     dependency: transitive
     description:
@@ -333,7 +336,10 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.1.6"
+<<<<<<< HEAD
 >>>>>>> 6b7f96bc16185de0d2e30ce814e4c738e1a9f8ef
+=======
+>>>>>>> d1a998a5890903d19840cc57459893405cae2ab0
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -409,7 +415,10 @@ packages:
     source: hosted
     version: "2.1.2"
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> d1a998a5890903d19840cc57459893405cae2ab0
   go_router:
     dependency: transitive
     description:
@@ -418,7 +427,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.6.2"
+<<<<<<< HEAD
 >>>>>>> 6b7f96bc16185de0d2e30ce814e4c738e1a9f8ef
+=======
+
+>>>>>>> d1a998a5890903d19840cc57459893405cae2ab0
   google_identity_services_web:
     dependency: transitive
     description:
@@ -891,7 +904,10 @@ packages:
     source: hosted
     version: "2.6.1"
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
+=======
+>>>>>>> d1a998a5890903d19840cc57459893405cae2ab0
   rxdart:
     dependency: transitive
     description:
@@ -900,7 +916,10 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+<<<<<<< HEAD
 >>>>>>> 6b7f96bc16185de0d2e30ce814e4c738e1a9f8ef
+=======
+>>>>>>> d1a998a5890903d19840cc57459893405cae2ab0
   shared_preferences:
     dependency: transitive
     description: