Fix Git Merge Conflicts When Stash Changes Are Involved - Understanding Git Merge Conflict Markers: A Practical Guide-Docker Compose Port Mapping Troubleshooting

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