Installed the FEC mod and now the GiftWrap mod - files are different, do you merge?

[pityocamptes]

I have no mods on my zencart, and just finished adding the FEC mod. I noticed that the FEC mod works with the Giftwrap mod. So I decided to install that. I stopped for the moment because I noticed that certain files (orders.php for example) are supposed to be uploaded for both mods. So basically if I upload the orders.php file for the giftwrap mod, I will overwrite the FEC orders.php. Am I supposed to compare both files and merge them using WINmerge for example? Thanks!

It says this in the readme:

New Files
=========
./includes/languages/english/extra_definitions/giftwrap.php
./includes/languages/english/modules/order_total/ot_giftwrap_checkout.php
./includes/modules/order_total/ot_giftwrap_checkout.php
./includes/extra_datafiles/giftwrap_tables.php
./includes/functions/extra_functions/local_lookups.php
./includes/extra_configures/giftwrap_settings.php
./admin/includes/languages/english/extra_definitions/giftwrap.php
./admin/includes/extra_configures/giftwrap_tables.php
./admin/includes/extra_configures/giftwrap_settings.php

Modified Files (No Overrides)
=============================
./includes/classes/order.php
./includes/modules/pages/checkout_shipping/header_php.php
./admin/invoice.php
./admin/orders.php
./admin/packingslip.php
./admin/includes/classes/order.php

Overrides
=========
./includes/templates/custom/templates/tpl_checkout_shipping_default.php
./includes/templates/custom/templates/tpl_account_history_info_default.php
./includes/templates/custom/templates/tpl_checkout_confirmation_default.php


but is this assuming no other mods are present? Thanks!

[creinold]

install and configure giftwrap mod... then install fec over it.

[pityocamptes]

install and configure giftwrap mod... then install fec over it.

Thanks. I already installed FEC. So, should I install the giftwrap mod over the FEC and then install FEC over the giftwrap mod? Will that work? Thanks!

What other mods work with FEC so that I should look at them to see if I should install them before having to reinstall FEC over said mod? Thanks!