Fix Git Merge Conflicts When Stash Changes Are Involved - Docker Compose Environment Variable Not Set in Container: Fixes-Resolving Module Not Found in npm Build

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