created banner and product
Resolve conflicts
added new file
nothing to commit
changes in category page
changes in categor.ts
changes
nothing to commit