vocab
fix conlict
final version