Resolving Git Merge Conflicts After Cherry-Pick - Resolve Python Permission Error Installing Packages Windows-How to Get VS Code Terminal Working Again on macOS

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