change sample in feature
merging in master