merge master plus frontend category/produt work