diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..d49e71f
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,33 @@
+name: SSH Upload and Composer Install
+
+on:
+  push:
+    branches:
+      - dev
+      - ci/ci-cd-for-api
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install SSH key
+        uses: webfactory/ssh-agent@v0.5.3
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      - name: Upload PHP code
+        run: scp -o StrictHostKeyChecking=no -r * ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_HOST }}:/home/julesartd/www/api-dev-edt-3il
+
+      - name: SSH into server and run composer install
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd /home/julesartd/www/api-dev-edt-3il/backend
+            composer2 install
\ No newline at end of file
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
         }
     }
 }