Resolving Git Merge Conflicts After Cherry-Pick - Resolve Cloudflare 522 Error Due to Plugin Issues-How to Add Python to PATH in Windows

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.