Update abbr.lex

Resolved a merge conflict