Git Merge Conflict: Keep Both Files Instead of One - Fix Windows Explorer Restarting After Login-Fix 'Windows Cannot Access Shared Folder' in Workgroup

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