added name column to merchants and seeded categories table
merge conflict resolved