Resolving Git Merge Conflicts After Cherry-Pick - Python UnicodeDecodeError When Opening Files: How to Fix-Python Requests Timeout: How to Set and Handle It

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