Fixed merge conflict

src/pages/Map.js

@@ -1,14 +0,0 @@
-import React, { Component } from 'react';
-import Typography from '@material-ui/core/Typography';
-
-class Map extends Component {
-    render() {
-        return (
-            <Typography variant='display1' align='center' gutterBottom>
-                Map
-            </Typography>
-        );
-    }
-}
-
-export default Map;

src/pages/Report.js

@@ -0,0 +1,12 @@
+import React, { Component } from 'react';
+import ReportForm from '../components/ReportForm';
+
+class Report extends Component {
+    render() {
+        return (
+            <ReportForm/>
+        );
+    }
+}
+
+export default Report;

src/pages/ViewMap.js

@@ -0,0 +1,14 @@
+import React, { Component } from 'react';
+import GoogleMap from '../components/SightingMap';
+
+class Sighting extends Component {
+    render() {
+        return (
+            <div className='sighting-map'>
+                <GoogleMap/>
+            </div>
+        );
+    }
+}
+
+export default Sighting;