don't save twice and add retry resource
Merge pull request #2352 from dimagi/update-conflict

don't save twice and add retry resource