merge conflict fic product.rb