Merge changes with Zen cart default 1.5.1