diff --git a/__pycache__/app.cpython-313.pyc b/__pycache__/app.cpython-313.pyc
new file mode 100644
index 0000000..921ed2d
Binary files /dev/null and b/__pycache__/app.cpython-313.pyc differ
diff --git a/app.py b/app.py
index b49af05..9667ecf 100644
--- a/app.py
+++ b/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 (
diff --git a/routes/__pycache__/reslevis.cpython-313.pyc b/routes/__pycache__/reslevis.cpython-313.pyc
index d556b21..cf23a96 100644
Binary files a/routes/__pycache__/reslevis.cpython-313.pyc and b/routes/__pycache__/reslevis.cpython-313.pyc differ
diff --git a/routes/reslevis.py b/routes/reslevis.py
index ccaa395..638637e 100644
--- a/routes/reslevis.py
+++ b/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:
diff --git a/schemas/__pycache__/reslevis.cpython-313.pyc b/schemas/__pycache__/reslevis.cpython-313.pyc
index 7d5a4b2..9baee46 100644
Binary files a/schemas/__pycache__/reslevis.cpython-313.pyc and b/schemas/__pycache__/reslevis.cpython-313.pyc differ