Resolve three conflicts, keeping both sides in each case:
- studio/backend/tests/test_llama_cpp_update.py: the _clean_state fixture
keeps this branch's routes.inference stub (so _run_update never blocks on a
real Studio backend singleton) alongside main's _whisper_chain_status stub.
- studio/setup.sh: keep both llama.cpp state flags. This branch's
_LLAMA_CPP_DEFERRED (WSL2 aarch64 background CUDA build is success, not
degraded) and main's _LLAMA_CPP_NO_SPACE are independent and both are read
later in the file.
- unsloth/models/_utils.py: keep the DGX Spark / N1X UMA helpers and their
four patch calls, then main's patch_unified_memory_safetensors_load. The
Spark block stays first so patch_dgx_spark_memory_config still sets
PYTORCH_CUDA_ALLOC_CONF before anything can touch the allocator; the
safetensors patch gates lazily inside its wrapper, so installing it after
does not init CUDA.
Verified every line main added since the merge base is still present in
install.sh, install.ps1, studio/setup.sh and studio/install_llama_prebuilt.py,
and likewise for this branch's own additions.
bba55af8aa