fixing bug insertion of lexicon
Fixing conflicts