Resolving Git Merge Conflicts in Binary Files - Nginx Permission Denied: Fix www-data User Access-How to Fix Git Non-Fast-Forward Rejection

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