Update client/package.json

Author: entrotech

client/package.json

@@ -30,11 +30,7 @@
     "debounce-fn": "^5.0.0",
     "formik": "^2.2.9",
     "js-file-download": "^0.4.12",
-<<<<<<< HEAD
-    "mapbox-gl": "^3.2.0",
-=======
     "mapbox-gl": "^3.8.0",
->>>>>>> release-1.0.86
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.6",