How to Resolve Git Merge Conflicts on the Same Line - Fix Python UnicodeDecodeError with os.listdir-Docker Container Exits Immediately: Fix with Restart Policy

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