Fix Git Merge Conflicts When Stash Changes Are Involved - Fix Windows 11 Update Stuck at 0% with SFC-How to Handle Merge Conflicts in Visual Studio Code

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