You'll have to compare that file from both those mods against each other and the original Zencart file to see what each has added (or left out) and then create one file which contains the changes from both. Sometimes it's pretty easy, sometimes impossible. I use Compare It! to compare files.