fix tsv
fix merge conf