don't fail hard if caching a restore payload raises a doc update conflict
Merge pull request #133 from dimagi/cz

don't fail hard if caching a restore payload raises a doc update conflict