Merge catalog\controller\common with opencart 1.5.5.1