Merge catalog\controller\feed\ with opencart 1.5.5.1