Fix merge issues on iOS

Author: aednlaxer

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m

@@ -123,12 +123,14 @@ - (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker
   [self setRotation:platformMarker.rotation];
   [self setVisible:platformMarker.visible];
   [self setZIndex:platformMarker.zIndex];
+  [self setCollisionBehavior:platformMarker.collisionBehavior];
+
 }
-- (void)setCollisionBehavior:(int)collisionBehavior {
-  if ([self.marker isKindOfClass:[GMSAdvancedMarker class]]) {
-    GMSCollisionBehavior collitionBehaviorValue = (GMSCollisionBehavior)collisionBehavior;
-    [(GMSAdvancedMarker *)self.marker setCollisionBehavior:(collitionBehaviorValue)];
-  }
+- (void)setCollisionBehavior:(FGMMarkerCollisionBehaviorBox*)collisionBehavior {
+    if ([self.marker isKindOfClass:[GMSAdvancedMarker class]]) {
+        GMSCollisionBehavior collitionBehaviorValue = (GMSCollisionBehavior)collisionBehavior.value;
+        [(GMSAdvancedMarker *)self.marker setCollisionBehavior:(collitionBehaviorValue)];
+    }
 }
 
 - (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker

packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart

@@ -898,6 +898,8 @@ class GoogleMapsFlutterIOS extends GoogleMapsFlutterPlatform {
         throw ArgumentError(
             'Unrecognized type of bitmap ${bitmap.runtimeType}', 'bitmap');
     }
+  }
+
   static PlatformMarkerType _platformMarkerTypeFromMarkerType(
       MarkerType markerType) {
     return switch (markerType) {

packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart

@@ -189,6 +189,7 @@ class PlatformMarker {
     this.visible = true,
     this.zIndex = 0.0,
     this.clusterManagerId,
+    this.collisionBehavior,
   });
 
   final double alpha;
@@ -205,6 +206,13 @@ class PlatformMarker {
   final double zIndex;
   final String markerId;
   final String? clusterManagerId;
+  final MarkerCollisionBehavior? collisionBehavior;
+}
+
+enum MarkerCollisionBehavior {
+  required,
+  optionalAndHidesLowerPriority,
+  requiredAndHidesOptional,
 }
 
 /// Pigeon equivalent of the Polygon class.
@@ -584,6 +592,25 @@ enum PlatformMapBitmapScaling {
   none,
 }
 
+class PlatformBitmapPinConfig {
+  PlatformBitmapPinConfig({
+    required this.backgroundColor,
+    required this.borderColor,
+    required this.glyphColor,
+    required this.glyphTextColor,
+    required this.glyphText,
+    required this.glyphBitmap,
+  });
+
+  final int? backgroundColor;
+  final int? borderColor;
+
+  final int? glyphColor;
+  final int? glyphTextColor;
+  final String? glyphText;
+  final PlatformBitmap? glyphBitmap;
+}
+
 /// Interface for non-test interactions with the native SDK.
 ///
 /// For test-only state queries, see [MapsInspectorApi].