diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..d6ca2bf
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "dart.flutterSdkPath": "C:\\flutter"
+}
\ No newline at end of file
diff --git a/backend/src/Controller/Api/TimetableController.php b/backend/src/Controller/Api/TimetableController.php
index c7444fc..2187dad 100644
--- a/backend/src/Controller/Api/TimetableController.php
+++ b/backend/src/Controller/Api/TimetableController.php
@@ -31,7 +31,11 @@ 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
         }
     }
 }
diff --git a/frontend/app_student/.fvmrc b/frontend/app_student/.fvmrc
new file mode 100644
index 0000000..090816f
--- /dev/null
+++ b/frontend/app_student/.fvmrc
@@ -0,0 +1,3 @@
+{
+  "flutter": "3.19.2"
+}
\ No newline at end of file
diff --git a/frontend/app_student/.gitignore b/frontend/app_student/.gitignore
index 29a3a50..75dfa95 100644
--- a/frontend/app_student/.gitignore
+++ b/frontend/app_student/.gitignore
@@ -41,3 +41,6 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+# FVM Version Cache
+.fvm/
\ No newline at end of file
diff --git a/frontend/app_student/.vscode/settings.json b/frontend/app_student/.vscode/settings.json
new file mode 100644
index 0000000..64c9e34
--- /dev/null
+++ b/frontend/app_student/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "dart.flutterSdkPath": ".fvm\\versions\\3.19.2"
+}
\ No newline at end of file