preparing for merge
changed sampling