update merge_one_per_sample to new file structure [ci skip]
new snakemake seems to require --directory . in cluster mode?? [ci skip]