add short_name field to merchant model