Use etag mismatch to merge concurrent changes