Nginx Configuration Test Failed: Fix Server Block Errors - Git Merge vs Rebase Conflicts: Key Differences and Fixes-Resolve Git Non-Fast-Forward Error When Pushing

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.