Resolving Git Merge Conflicts Between Two Branches - Cloudflare 522 Timeout: Disable Proxy Temporarily-Fix VS Code Source Control Not Detecting Changes on Ubuntu

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