merge

Kinding NonEmptyKinding NonEmptyTaxonomy Taxonomy