fixing Product.java
resolved conflicts