Fix VS Code Source Control Not Detecting Changes with Permission Denied - Troubleshooting npm run build Failures-Resolve Git Merge Conflicts by Keeping Both Files

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