diff --git a/app_petty_cash/pubspec.lock b/app_petty_cash/pubspec.lock
index b477586..a7646ef 100644
--- a/app_petty_cash/pubspec.lock
+++ b/app_petty_cash/pubspec.lock
@@ -408,6 +408,7 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
+<<<<<<< HEAD
   js:
     dependency: transitive
     description:
@@ -424,6 +425,8 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.8.1"
+=======
+>>>>>>> 1696e47cd3c38c9dd74f2ad18bd84091fc6c92fa
   lints:
     dependency: transitive
     description: