Fix Git Merge Conflicts When Stash Changes Are Involved - Docker Socket Permission Issues Causing Nginx 502-Fix Docker Container Exits Immediately After Start

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