Merge catalog\controller\product with opencart 1.5.5.1