option for not sub-sampling
merge conflict