diff --git a/components/MapComponent.js b/components/MapComponent.js
index ad1d69b09..9d0024754 100644
--- a/components/MapComponent.js
+++ b/components/MapComponent.js
@@ -899,10 +899,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
   }
 
   //------------------------------------------
-<<<<<<< HEAD
 
-=======
->>>>>>> 1a87c21 (Server configuration)
   const fetchDeviceNameById = async (idLD) => {
     try {
       const response = await fetch(`/api/locationDeviceNameById?idLD=${idLD}`);
@@ -919,11 +916,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
   };
 
   //------------------------------------------
-<<<<<<< HEAD
-=======
 
-  //------------------------------------------
->>>>>>> 1a87c21 (Server configuration)
   //          poiLayerRef(poiDbLayer)  POI   hinzufügen
   //--------------------------------------------
 
@@ -941,10 +934,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
         //console.log("location.idPoiTyp poiLayer:", location.idPoiTyp);
         console.log("location.idPoiTyp poiLayer:", location);
         console.log("location.idPoiTyp:", location.idPoiTyp);
-<<<<<<< HEAD
-=======
 
->>>>>>> 1a87c21 (Server configuration)
         const deviceName = await fetchDeviceNameById(location.idLD);
         const marker = L.marker([latitude, longitude], {
           icon: L.icon({
@@ -973,11 +963,9 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
         marker.bindPopup(`
         <div>
             <b  class="text-xl text-black-700">${location.description || "Unbekannt"}</b><br>
-<<<<<<< HEAD
-            ${deviceName}<br> <!-- Gerät:-->
-=======
+
                    ${deviceName}<br> <!-- Gerät:-->
->>>>>>> 1a87c21 (Server configuration)
+
           ${poiTypName}<br> <!-- Typ:-->
         </div>
     `);
@@ -998,18 +986,12 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
           //console.log("poiLayer Marker Beschreibung:", location.description);
           //Informationen an handlePoiSelect  übergeben
           handlePoiSelect(poiData);
-<<<<<<< HEAD
+
           console.log("poiData in MapComponent.js:", poiData);
-=======
 
           setCurrentPoi(location);
           console.log("POI-Daten currentPoi:", currentPoi);
           //console.log("poiData in MapComponent.js:", poiData);
-<<<<<<< HEAD
-          
->>>>>>> b983067 (Prepair: With Recoil atom pass current poi data from MapComponent to poiUpdateModal.js when mouse over)
-=======
->>>>>>> 1a87c21 (Server configuration)
         });
         marker.on("mouseout", function () {
           this.closePopup();
diff --git a/config/config.js b/config/config.js
index 7116a6411..30f5e05dc 100644
--- a/config/config.js
+++ b/config/config.js
@@ -30,11 +30,8 @@ if (typeof window !== "undefined") {
   mapGisSystemStaticUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic?idMap=${c}&idUser=${user}`;
   mapDataIconUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GetIconsStatic`;
 
-<<<<<<< HEAD
-  /*    mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict`;
-=======
   /*   mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict`;
->>>>>>> 1a87c21 (Server configuration)
+
   mapGisStationsStatusDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStatusDistrict`;
   mapGisStationsMeasurementsUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsMeasurements`;
   mapGisSystemStaticUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic`;