Resolving Git Merge Conflicts Between Two Branches - Fix Windows Explorer Restarting with SFC Scannow-Troubleshoot VS Code Terminal and Conda

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