Fix Git Merge Conflicts When Stash Changes Are Involved - Cloudflare Full Strict SSL: Origin Server Fixes-Windows Defender Real-Time Protection Service Not Running Fix

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