# Conflicts: Resolved # lib/core/model/pharmacies/order_model.dart # lib/core/service/client/base_app_client.dart # lib/main.dart # lib/pages/landing/home_page.dart # lib/pages/pharmacy/order/OrderDetails.dart # lib/pages/pharmacy/order/TrackDriver.dart # lib/routes.dart # lib/uitl/translations_delegate_base.dart # lib/uitl/utils.dart # lib/widgets/in_app_browser/InAppBrowser.dart # lib/widgets/others/app_scaffold_widget.dart # pubspec.yaml