Resolving Git Merge Conflicts After Cherry-Pick - Stop Windows Security App from Crashing-Windows Security App Not Opening Command Prompt Fix

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.