# Merge pull request \#158 from SunkenInTime/codex/sync-recovery-followup · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/bb56ffd8f088766a4d61ef481002cb0a314162c2)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: bb56ffd8f088766a4d61ef481002cb0a314162c2

Requested commit: bb56ffd8f088766a4d61ef481002cb0a314162c2

Commit: bb56ffd8f088766a4d61ef481002cb0a314162c2

Tree: d514a2cbf2c98e02042d1b96a0e4e346cfb7baf7

Author: Dara Adedeji

Committer: GitHub

## Message

```
Merge pull request #158 from SunkenInTime/codex/sync-recovery-followup

Fix cloud conflict adoption and durable media recovery
```

## Parents

- [b1e74c38c22b6ac6e3aa226d1494223d77898bd6](https://git.cafe/dara/icarus/commit/b1e74c38c22b6ac6e3aa226d1494223d77898bd6?format=markdown)

- [336a586387266c88aa1a5833ae4333e07ad9d145](https://git.cafe/dara/icarus/commit/336a586387266c88aa1a5833ae4333e07ad9d145?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/bb56ffd8f088766a4d61ef481002cb0a314162c2?format=markdown)