updated validations and made change to update method
fixed merge conflict in product.rb