Remove round-thumbnails setting
Add setting to display vendor details for products
list collections
fix merge conflict