Fix Git Merge Conflicts with Deleted Files - Resolve Windows 11 Update 0% Progress Due to Corruption-Ubuntu Docker Disk Space Full Error Fix

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.