featured products page styling
merge conflict