Merged unrelated histories and resolved conflicts

README.md

@@ -554,3 +554,4 @@ A: Full CPU by default. Use `--workers 1` for single-threaded, or limit with `--
 
 **Last Updated:** December 31, 2025
 **Version:** 2.0 with Windows and Linux Wrapper Scripts
+>>>>>>> 91418fa898de4a73e144a9fb9202b2315e922ab9

SETUP.md

@@ -10,6 +10,7 @@
 ### Installation
 
 **On Linux (Server/WSL):**
+>>>>>>> 91418fa898de4a73e144a9fb9202b2315e922ab9
 ```bash
 # Clone repository
 git clone https://gitea.theflagroup.com/bnair/VMAFOptimiser.git /opt/Optmiser
@@ -300,7 +301,6 @@ cat /opt/Optmiser/logs/failed_encodes.jsonl | jq '.'
 ## Git Workflow
 
 ### Initial Setup
-
 ```bash
 cd /opt/Optmiser
 git init
@@ -312,7 +312,6 @@ git push -u origin main
 ```
 
 ### Daily Updates
-
 ```bash
 cd /opt/Optmiser
 git pull origin main