merge conflicts resolved

lib/generated/locale_keys.g.dart

@@ -1920,7 +1920,6 @@ abstract class  LocaleKeys {
   static const refundReason6 = 'refundReason6';
   static const refundReason7 = 'refundReason7';
   static const selectProcedures = 'selectProcedures';
-  static const selectProcedures = 'selectProcedures';
   static const beforeUsingSymptomsChecker = 'beforeUsingSymptomsChecker';
   static const symptomsCheckerNotDiagnosis = 'symptomsCheckerNotDiagnosis';
   static const symptomsCheckerNotEmergency = 'symptomsCheckerNotEmergency';

pubspec.lock

@@ -499,6 +499,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_amazonpaymentservices:
+    dependency: "direct main"
+    description:
+      name: flutter_amazonpaymentservices
+      sha256: "23f45fd3b1e12a0933da3704d66cebd19c4c41e28a50d4fd458d3e3e6311f332"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.13"
   flutter_cache_manager:
     dependency: transitive
     description:
@@ -1641,6 +1649,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  screen_brightness:
+    dependency: "direct main"
+    description:
+      name: screen_brightness
+      sha256: "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  screen_brightness_android:
+    dependency: transitive
+    description:
+      name: screen_brightness_android
+      sha256: "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  screen_brightness_ios:
+    dependency: transitive
+    description:
+      name: screen_brightness_ios
+      sha256: f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  screen_brightness_macos:
+    dependency: transitive
+    description:
+      name: screen_brightness_macos
+      sha256: "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  screen_brightness_platform_interface:
+    dependency: transitive
+    description:
+      name: screen_brightness_platform_interface
+      sha256: "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  screen_brightness_windows:
+    dependency: transitive
+    description:
+      name: screen_brightness_windows
+      sha256: c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   scrollable_positioned_list:
     dependency: "direct main"
     description: