Resolving Git Merge Conflicts Between Two Branches - Fix Windows Search Not Returning Results-Docker Context Canceled: Fix with .dockerignore

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