update taxonomy model and some others files in taxonomy
fix merge conflict