diff --git a/src/components/DrawTools.js b/src/components/DrawTools.js
index 1aa26c927ca70948f9ed208ff28958215960ae43..00ee52aa71938a5e4159edaaf65464381c1b525b 100644
--- a/src/components/DrawTools.js
+++ b/src/components/DrawTools.js
@@ -62,7 +62,6 @@ L.DrawToolbar.include({
 });
 
 class DrawTools extends Component {
-<<<<<<< src/components/DrawTools.js
   constructor(props) {
     super(props);
     this.state = {
@@ -174,77 +173,6 @@ class DrawTools extends Component {
       </FeatureGroup>
     );
   }
-=======
-	constructor(props){
-	  super(props);
-	  this.state = {
-		  geoJSONAll: [] // property for all GeoJSON data in the map
-	  }
-  }
-  
-	_onCreated = (e) => {
-		let type = e.layerType; // from the example; isn't used right now, but may be relevant in the future
-		let layer = e.layer;
-    this.makeGeoJSON(e.layer);
-	}
-
-  // turn layer to GeoJSON data and add it to an array of all GeoJSON data of the current map
-	makeGeoJSON = (e) => {
-    let geoJSON = e.toGeoJSON();
-    let newGeoJSONAll = this.state.geoJSONAll;
-    newGeoJSONAll.push(geoJSON);
-    this.setState({geoJSONAll: newGeoJSONAll});
-    console.log(JSON.stringify(geoJSON, null, 4)); // printing GeoJSON data of the previous object create
-    console.log("newGeoJSONAll.length: " + newGeoJSONAll.length);
-	}
-	
-	render() {
-		return (
-			// "It's important to wrap EditControl component into FeatureGroup component from react-leaflet. The elements you draw will be added to this FeatureGroup layer, when you hit edit button only items in this layer will be edited."
-			<FeatureGroup> 
-				<EditControl
-					position='topright'
-					onCreated={this._onCreated}
-					draw={{
-						circle: {
-							repeatMode: true, // allows using the tool again after finishing the previous shape
-							shapeOptions: {
-								color: '#f9f10c',
-								opacity: 100
-							}
-						},
-						rectangle: {
-							repeatMode: true
-						},
-						polygon: {
-							repeatMode: true,
-							allowIntersection: false, // Restricts shapes to simple polygons
-							drawError: {
-								color: '#e1e100', // Color the shape will turn when intersects
-								message: '<strong>Oh snap!<strong> you can\'t draw that!' // Message that will show when intersect
-							},
-							shapeOptions: {
-								color: '#ed2572',
-								opacity: 100
-							}
-						},
-						polyline: {
-							repeatMode: true,
-							shapeOptions: {
-								color: '#ed2572',
-								opacity: 100
-							}
-						},
-						marker: {
-							repeatMode: true
-						},
-						circlemarker: false
-					}}
-				/>
-			</FeatureGroup>
-		)
-	}
->>>>>>> src/components/DrawTools.js
 }
 
 export default DrawTools;