fix doc update conflict errors
Merge pull request #2365 from dimagi/retry

fix doc update conflict errors