Git Merge Conflict: Keep Both Files Instead of One - Fix Nginx Configuration Test Failure After Adding Proxy Pass-Resolving 'index.lock file exists' in Git

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