Fix Git Merge Conflicts When Stash Changes Are Involved - Resolve Git Clone Timeout Behind Proxy-Edge Sync Setting Not Showing Up

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