server boot error fix

app.py

@@ -153,11 +153,7 @@ async def stop_mqtt_monitor():
 async def local_then_core(request: Request, call_next):
     internal_core_proxy_paths = {
         "/reslevis/updateAlarm",
-<<<<<<< HEAD
-         "/reslevis/updateCoreSettings",
-=======
         "/reslevis/updateCoreSettings",
->>>>>>> Tracker_bug_fix_20260429
     }
     # only proxy CRUD for Reslevis (change prefix or methods if needed)
     if (

routes/reslevis.py

@@ -49,11 +49,7 @@ from security import get_current_user
 CORE_BASE_URL = config_env.CORE_API_URL.rstrip("/")
 ALERTS_CORE_BASE_URL = "http://localhost:1902"
 TRACKS_CORE_BASE_URL = "http://localhost:1902"
-<<<<<<< HEAD
-SETTINGS_CORE_BASE_URL = "http://localhost:1902"
-=======
 SETTINGS_CORE_BASE_URL = "http://127.0.0.1:1902"
->>>>>>> Tracker_bug_fix_20260429
 CORE_TIMEOUT = 2.0  # secondi
 
 async def sync_core_get(request: Request) -> None: