arc/sync.md | 6 +- corpus/icloud-merge/README.md | 8 + corpus/icloud-merge/first-edit-checkpoints/Mac.one | Bin 0 -> 13512 bytes corpus/icloud-merge/first-edit-checkpoints/iPhone.one | Bin 0 -> 17872 bytes crates/notebook/README.md | 6 +- crates/notebook/src/resolve.rs | 54 ++++--- crates/notebook/tests/cloud.rs | 263 ++++++++++++++++++++++++++------ 7 files changed, 261 insertions(+), 76 deletions(-)