corrections to partial_put and has_conflict