[OE-3987] do conflict detection and resolution on delete() as well as save()