Fix Windows 11 Blue Screen After Update Uninstall Problem - Git Merge Conflict: Keep Both Files Instead of One-Fix Git Non-Fast-Forward Rejection

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