diff --git a/patch-fbc.sh b/patch-fbc.sh
index ff3de82..e78fa7b 100755
--- a/patch-fbc.sh
+++ b/patch-fbc.sh
@@ -271,31 +271,34 @@ get_supported_versions () {
 }
 
 patch_common () {
-    NVIDIA_SMI="$(command -v nvidia-smi || true)"
-    if [[ ! "$NVIDIA_SMI" ]] ; then
-        echo 'nvidia-smi utility not found. Probably driver is not installed.'
-        exit 1
-    fi
-
     if [[ "$manual_driver_version" ]]; then
         driver_version="$manual_driver_version"
 
         echo "Using manually entered nvidia driver version: $driver_version"
+     
     else
-        cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
-        driver_versions_list=$($cmd) || (
-            ret_code=$?
-            echo "Can not detect nvidia driver version."
-            echo "CMD: \"$cmd\""
-            echo "Result: \"$driver_versions_list\""
-            echo "nvidia-smi retcode: $ret_code"
+        # Try to detect nvidia-smi, but don't exit if it's not found
+        NVIDIA_SMI="$(command -v nvidia-smi || true)"
+    
+        if [[ ! "$NVIDIA_SMI" ]] ; then
+            echo 'nvidia-smi utility not found. Probably driver is not installed.'
             exit 1
-        )
-        driver_version=$(echo "$driver_versions_list" | head -n 1)
+        else
+            cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
+            driver_versions_list=$($cmd) || (
+                ret_code=$?
+                echo "Can not detect nvidia driver version."
+                echo "CMD: \"$cmd\""
+                echo "Result: \"$driver_versions_list\""
+                echo "nvidia-smi retcode: $ret_code"
+                exit 1
+            )
+            driver_version=$(echo "$driver_versions_list" | head -n 1)
 
-        echo "Detected nvidia driver version: $driver_version"
+            echo "Detected nvidia driver version: $driver_version"
+        fi
     fi
-
+    
     if ! check_version_supported "$driver_version" ; then
         echo "Patch for this ($driver_version) nvidia driver not found."
         echo "Patch is available for versions: "
diff --git a/patch.sh b/patch.sh
index fec714e..617c371 100755
--- a/patch.sh
+++ b/patch.sh
@@ -309,30 +309,52 @@ get_supported_versions () {
 }
 
 patch_common () {
+ if [[ "$manual_driver_version" ]]; then
+        driver_version="$manual_driver_version"
+<<<<<<< HEAD
+
+        echo "Using manually entered nvidia driver version: $driver_version"
+     
+=======
+        
+        echo "Using manually entered Nvidia driver version: $driver_version"
+    else
+    
     NVIDIA_SMI="$(command -v nvidia-smi || true)"
+    
     if [[ ! "$NVIDIA_SMI" ]] ; then
         echo 'nvidia-smi utility not found. Probably driver is not installed.'
         exit 1
-    fi
-
-    if [[ "$manual_driver_version" ]]; then
-        driver_version="$manual_driver_version"
-
-        echo "Using manually entered nvidia driver version: $driver_version"
+    
+>>>>>>> parent of ff838cf (Update patch.sh)
     else
-        cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
-        driver_versions_list=$($cmd) || (
-            ret_code=$?
-            echo "Can not detect nvidia driver version."
-            echo "CMD: \"$cmd\""
-            echo "Result: \"$driver_versions_list\""
-            echo "nvidia-smi retcode: $ret_code"
+        # Try to detect nvidia-smi, but don't exit if it's not found
+        NVIDIA_SMI="$(command -v nvidia-smi || true)"
+    
+        if [[ ! "$NVIDIA_SMI" ]] ; then
+            echo 'nvidia-smi utility not found. Probably driver is not installed.'
             exit 1
-        )
-        driver_version=$(echo "$driver_versions_list" | head -n 1)
+        else
+            cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
+            driver_versions_list=$($cmd) || (
+                ret_code=$?
+                echo "Can not detect nvidia driver version."
+                echo "CMD: \"$cmd\""
+                echo "Result: \"$driver_versions_list\""
+                echo "nvidia-smi retcode: $ret_code"
+                exit 1
+            )
+            driver_version=$(echo "$driver_versions_list" | head -n 1)
 
-        echo "Detected nvidia driver version: $driver_version"
+<<<<<<< HEAD
+            echo "Detected nvidia driver version: $driver_version"
+        fi
     fi
+=======
+        echo "Detected nvidia driver version: $driver_version"
+       
+       fi
+>>>>>>> parent of ff838cf (Update patch.sh)
 
     if ! check_version_supported "$driver_version" ; then
         echo "Patch for this ($driver_version) nvidia driver not found."
@@ -380,9 +402,9 @@ patch_common () {
     done
 
     [[ "$dir_found" ]] || { echo "ERROR: cannot detect driver directory"; exit 1; }
-
 }
 
+
 ensure_bytes_are_valid () {
     driver_file="$driver_dir/$object.$driver_version"
     original_bytes=$(awk -F / '$2 { print $2 }' <<< "$patch")