add quantity
fix conflict product controller