small changes
resolved conflict
adding name to product