Resolving Git Merge Conflicts in Binary Files - Fix Docker Build Fails: No Space Left on Device-How to Restore Edge Sync After an Update

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