Merge templates with opencart 1.5.5.1