resolve merge conflicts

example/lib/main.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:math';
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show rootBundle;

example/pubspec.lock

@@ -184,6 +184,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -272,7 +279,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:

lib/google_track_trace.dart

@@ -7,9 +7,9 @@ import 'dart:math';
 import 'dart:typed_data';
 import 'dart:ui' as ui;
 
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_polyline_points/flutter_polyline_points.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:http/http.dart' as http;

lib/src/directions_repository.dart

@@ -38,7 +38,8 @@ class DirectionsRepository {
       debugPrint(e.message);
     }
     throw GoogleMapsException(
-        'Unable to retrieve directions from Google Maps API',);
+      'Unable to retrieve directions from Google Maps API',
+    );
   }
 }
 

lib/src/google_map.dart

@@ -114,6 +114,9 @@ class _GoogleTrackTraceMapState extends State<GoogleTrackTraceMap> {
   @override
   Widget build(BuildContext context) {
     return GoogleMap(
+      gestureRecognizers: {
+        Factory<EagerGestureRecognizer>(() => EagerGestureRecognizer())
+      },
       initialCameraPosition: calculateCameraPosition(
         controller.start.position,
         controller.end.position,