Fixing last product.jsp merges