4 products pages color consistency
merge conflict