Fix problems with the latest merge

package.json

@@ -11,9 +11,8 @@
     "react-dom": "^16.8.6",
     "react-leaflet": "^2.3.0",
     "react-leaflet-draw": "0.19.0",
-    "universal-cookie": "^4.0.0"
+    "universal-cookie": "^4.0.0",
     "react-scripts": "3.0.1"
-
   },
   "scripts": {
     "start": "react-scripts start",

src/App.js

 import React, { Component } from 'react';
 import '../node_modules/leaflet-draw/dist/leaflet.draw.css'
 import './App.css';
-
-import UserMap from './components/UserMap.js'
-
-import styles from './App.css';
 import UserMap from './components/UserMap';
 import Header from './components/Header';
 

src/components/UserMap.js

@@ -2,7 +2,9 @@ import React, {Component} from 'react';
 import {
 	Map,
 	TileLayer,
-	ZoomControl
+  ZoomControl,
+  Marker,
+  Popup
 } from 'react-leaflet'
 import DrawTools from './DrawTools.js'