chore: resolve lockfile merge conflicts blocking #427#439

Merged

mpaulosky merged 1 commit into

devfrom

squad/427-lockfile-conflict-fix

Jul 4, 2026

GitHub Actions / Test Results Summary succeeded Jul 4, 2026 in 0s

All 518 tests pass, 38 skipped in 17s

556 tests 518 ✅ 17s ⏱️
6 suites 38 💤
6 files 0 ❌

Results for commit f0d2a75.

View more details on GitHub Actions