fixed merge conflicts

src/components/SightingMap.js

@@ -119,8 +119,8 @@ export class MapContainer extends Component {
             // center map on Grand Rapids, Michigan
             this.setState({
                 myLatLng: {
-                    lat: 42.9634,
-                    lng: 85.6681
+                    lat: 43.8666776,
+                    lng: -85.9667325 
                 }
             });
         }
@@ -251,8 +251,8 @@ export class MapContainer extends Component {
     // marker and info window information
     state = {
         myLatLng: {
-            lat: 42.9634,
-            lng: 85.6681
+            lat: 43.8666776,
+            lng: -85.9667325 
         },
         showingInfoWindow: false,
         activeMarker: {},
@@ -271,16 +271,12 @@ export class MapContainer extends Component {
                     google={this.props.google}
                     initialCenter={this.state.myLatLng}
                     center={this.state.myLatLng}
-<<<<<<< HEAD
                     minZoom={6}
                     zoom={6}
                     onClick={this.onMapClick} >
-=======
                     defaultZoom={15}
                     onClick={this.onMapClick}
                 >
->>>>>>> 80a73145f79c96ee62e901f94528550ad8761cca
-
                     <Marker
                         position={this.state.myLatLng}
                         onClick={this.onMarkerClick}