Would you please have a look? Thank you for your efforts!
═══ Phase 5: Patching 11 modified files ═══
[WARN] 3-way merge had conflicts for: Loop/Managers/DeviceDataManager.swift
[WARN] → Check for conflict markers and resolve manually.
[OK] Patched: Loop/Managers/LoopAppManager.swift
[OK] Patched: Loop/View Controllers/InsulinDeliveryTableViewController.swift
[OK] Patched: Loop/View Controllers/StatusTableViewController.swift
[OK] Patched: Loop/View Models/AddEditFavoriteFoodViewModel.swift
[OK] Patched: Loop/View Models/CarbEntryViewModel.swift
[OK] Patched: Loop/View Models/SettingsViewModel.swift
[OK] Patched: Loop/Views/AddEditFavoriteFoodView.swift
[OK] Patched: Loop/Views/CarbEntryView.swift
[OK] Patched: Loop/Views/FavoriteFoodDetailView.swift
[OK] Patched: Loop/Views/FavoriteFoodsView.swift
[INFO] Patched: 10, Skipped: 0, Conflicts: 1
[WARN] Some files had merge conflicts. Resolve them before building.
Would you please have a look? Thank you for your efforts!
═══ Phase 5: Patching 11 modified files ═══
[WARN] 3-way merge had conflicts for: Loop/Managers/DeviceDataManager.swift
[WARN] → Check for conflict markers and resolve manually.
[OK] Patched: Loop/Managers/LoopAppManager.swift
[OK] Patched: Loop/View Controllers/InsulinDeliveryTableViewController.swift
[OK] Patched: Loop/View Controllers/StatusTableViewController.swift
[OK] Patched: Loop/View Models/AddEditFavoriteFoodViewModel.swift
[OK] Patched: Loop/View Models/CarbEntryViewModel.swift
[OK] Patched: Loop/View Models/SettingsViewModel.swift
[OK] Patched: Loop/Views/AddEditFavoriteFoodView.swift
[OK] Patched: Loop/Views/CarbEntryView.swift
[OK] Patched: Loop/Views/FavoriteFoodDetailView.swift
[OK] Patched: Loop/Views/FavoriteFoodsView.swift
[INFO] Patched: 10, Skipped: 0, Conflicts: 1
[WARN] Some files had merge conflicts. Resolve them before building.