fixed names of token taggings
added dependency parse definition
merge