Flatten scope, will allow multiple has_short_name configurations in the future.
More support for multiple columns
Add test for multiple columns
resolve_conflicts -> resolve_#{column}_conflicts
Only add AR proxy if defined.