merger with opencart 1.5.6