change merge vcf to handle non-diploid sites