diff --git a/api/v1/areaFunctions.js b/api/v1/areaFunctions.js
index c0dbb5b..9432720 100644
--- a/api/v1/areaFunctions.js
+++ b/api/v1/areaFunctions.js
@@ -89,11 +89,7 @@ module.exports = {
                 console.log(polygon);
                 if (polygon.coords[0].lat != polygon.coords[polygon.length - 1].lat &&
                     polygon.coords[0].lng != polygon.coords[polygon.length - 1].lng) {
-<<<<<<< HEAD
                         polygon.coords.push({lat: polygon.coords[0].lat, lng: polygon.coords[0].lng})
-=======
-                        polygon.coords.push({lat: polygon[0].lat, lng: polygon[0].lng})
->>>>>>> f286983573b5980aa50e49c72893ccc0e1744e45
                 }
                 let intersect = module.exports.checkIntersects(polygonPoints, polygon.coords);
                 if (intersect != null) {