Resolving Git Merge Conflicts After Cherry-Pick - VS Code Terminal Permission Denied Error Fix-Resolve 'package.json not found' in npm

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