diff --git a/setup.sh b/setup.sh
index 0dd7d1b..98c74dc 100755
--- a/setup.sh
+++ b/setup.sh
@@ -25,8 +25,20 @@ INSTALL_DIR=${input_dir:-/home/pi/jarvis-ai}
 # Pfad normalisieren
 INSTALL_DIR=$(realpath -m "$INSTALL_DIR")
 
+<<<<<<< HEAD
+# 3. Repository klonen
+if [ ! -d "$INSTALL_DIR" ]; then
+    echo "--- Klone Repository von $REPO_URL..."
+    git clone --branch main --single-branch "$REPO_URL" "$INSTALL_DIR"
+else
+    echo "--- Verzeichnis $INSTALL_DIR existiert bereits. Überspringe Klonen..."
+fi
+
+# In das Verzeichnis wechseln
+=======
 echo -e "\n${C_GREEN}Zielverzeichnis: ${C_BOLD}$INSTALL_DIR${C_DEF}"
 mkdir -p "$INSTALL_DIR"
+>>>>>>> dev
 cd "$INSTALL_DIR" || exit
 
 # 1. System-Abhängigkeiten
@@ -260,5 +272,4 @@ EOF"
         echo "export PYTHONPATH=\$PYTHONPATH:\$(pwd)/source"
         echo "python3 -m uvicorn source.main:app --host 0.0.0.0 --port 8000"
         echo -e "${C_GREEN}${C_BOLD}==========================================${C_DEF}"
-    fi
-fi
\ No newline at end of file
+    fi
\ No newline at end of file