categories & products
conflict solved