If you're just looking for the merge to those (2) mods.. I did one several years (gawdz)
has posted the merged .2da on his site. Link is provided in each of the mods' listing.
However, like the others have mentioned... may require more tinkering if you're adding a ton of other mods. Will be helpful to use as a base however
Also have one for merged Stormtrooper/Clone/Jabba Palace.. though stoffe's
.2da tools are invaluable nowadays and will probably cause MUCH LESS headaches