added taxon_names to taxon_scheme_taxa
merged some conflicts