Is there anyone using the Stock by Attributes Mod as well as the Time Zone Offset Mod?

As both of them modify the following common files:

admin/orders.php
includes/classes/order.php

I was wondering if anyone had successfully merged these two files, and if so, could they post them so that I could download them?

Kind regards,
Anthony