fix conflict in customer and product