fix merge problem in products.xhtml