Fix Git Merge Conflicts When Stash Changes Are Involved - Docker Compose Environment Variables: .env, Shell, and More-Cloudflare DNS Slow Propagation Fix

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