Two conflicts, both on the stderr-merge fix: managed_uv.py keeps the fix on upstream's compact formatting; main.py taken from upstream (the refactor moved _run_install_with_heartbeat to main_install_repair.py) and the fix ported to the moved helper, which had reverted to a bare subprocess.run.