Resolving Git Merge Conflicts After Cherry-Pick - Fix Docker Desktop Engine Stopped Error (Firewall Block)-Fix 'pip install externally managed environment' Error

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