typo
more vocab
fixed merge