Understanding Git Merge Conflict Markers: A Practical Guide - How to Resolve npm package.json Not Found-Fix Nginx Upstream Connection Refused in Proxy Pass

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