Git Merge Conflict: Keep Both Files Instead of One - Windows Defender Real-Time Protection Stuck Off-Fix PR_CONNECT_RESET_ERROR in Firefox by Clearing Cache

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