diff --git a/backend/src/Controller/Api/TimetableController.php b/backend/src/Controller/Api/TimetableController.php
index 2187dad..c7444fc 100644
--- a/backend/src/Controller/Api/TimetableController.php
+++ b/backend/src/Controller/Api/TimetableController.php
@@ -31,11 +31,7 @@ public function index(Request $request): JsonResponse
             $parsedJson = $this->timetableService->fetchAndParseData($xmlUrl);
             return $this->json($parsedJson);
         } else {
-<<<<<<< HEAD
             return $this->json(['error' => 'Invalid XML url'], JsonResponse::HTTP_BAD_REQUEST);
-=======
-            return $this->json(['error' => 'Invalid xml url'], JsonResponse::HTTP_BAD_REQUEST);
->>>>>>> dev
         }
     }
 }