Resolving Git Merge Conflicts Between Two Branches - How to Make VS Code Detect Changes in Subfolder-Resolve Nginx Permission Denied on Static Assets

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