Git Merge Conflict: Keep Both Files Instead of One - Resolve Unable to Get Local Issuer Certificate in Git on Windows-Python venv Activation Not Working in CMD

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