Detect and resolve eventual conflicts

Detect and resolve eventual conflicts. See the section "Eventual conflicts" on PouchDB website.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information