# Conflicts: # android/app/src/main/AndroidManifest.xml # lib/main.dart # lib/screens/google_map_screen.dart # macos/Flutter/GeneratedPluginRegistrant.swift # pubspec.lock # pubspec.yaml # windows/flutter/generated_plugin_registrant.cc # windows/flutter/generated_plugins.cmake