added store_name column to vendors table
resolved buyer.rb merge conflict