automatic abbreviation
merge conflict
automatic abbreviation, tests and controller