take sidebar out of products page
fix merge conflict