Fix npm run build Failures After npm install - Resolving Git Merge Conflicts During Pull-Mac M1 Docker Engine Failure: How to Restart

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