Merge "Adds exception.Conflict handler to is_resource_delete function"