Git Merge Conflict: Keep Both Files Instead of One - Nginx 502 Bad Gateway Docker Permission Denied Fix-Git Push Rejected Non Fast Forward: Causes and Solutions

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