diff --git a/schemas/reslevis.py b/schemas/reslevis.py
index b76d4c3..268f60e 100644
--- a/schemas/reslevis.py
+++ b/schemas/reslevis.py
@@ -25,10 +25,7 @@ class FloorItem(BaseModel):
 class ZoneItem(BaseModel):
     id: UUID
     name: str
-<<<<<<< HEAD
     groups: Optional[List[UUID]] = None
-=======
->>>>>>> Tracker_bug_fix_20260429
     floor: Optional[UUID] = None
     building: Optional[UUID] = None
 
@@ -207,14 +204,9 @@ class TrackHistoryItem(BaseModel):
 
 class TrackerZoneItem(BaseModel):
     id: UUID
-<<<<<<< HEAD
-    name: str
-=======
     name: Optional[str] = None
     zoneList: List[UUID]
->>>>>>> Tracker_bug_fix_20260429
     tracker: UUID
-    zoneList: list[UUID]
     days: Optional[str] = None
     time: Optional[str] = None