don't conflict when nothing changed, fix #641

this fixes two cases:

* the document was created locally and a 404 comes in
* the document was changed locally and a 200 or 304 comes in in which nothing changed

in both these cases, the locally created version should not be deleted