Sample.set_samples refactored
refactored
solve conflict
undo test result