Help Merging Mods

[vortex3636]

I want to use the Unofficial Patch III mod but it says I cannot use it in junction with other mods that mod the same files. Makes sense. It also gave instructions, and even references a program (WinMerge), to help in merging his changes to specific files into the other mods files (his instructions, not my own idea). However the only instructions are as follows:

"Open both the other-mod file and the Unofficial Patch file in WinMerge, and search for the Unofficial Patch differences to merge into the other mod."

I thought it sounded easy enough but when I opened the files I was confused as to what needed to be moved where.

For example, UPIII and More Information - Top Panel both use the TopPanel.lua file (go figure...):

Unofficial Patch III looks like:

Spoiler :

-- Unofficial Patch Fix: local iTotalHappiness = iGarrisonedUnitsHappiness + ...
local iTotalHappiness = iGarrisonedUnitsHappiness + iPoliciesHappiness + iResourcesHappiness + iBuildingHappiness + iMinorCivHappiness + iHandicapHappiness + iTradeRouteHappiness + iReligionHappiness + iNaturalWonderHappiness + iExtraHappinessPerCity;

(The "..." on what I assume is his comment is his own doing, not me shortening anything)

While More Information - Top Panel looks like:

Spoiler :

local iTotalHappiness = iPoliciesHappiness + iResourcesHappiness + iBuildingHappiness + iMinorCivHappiness + iHandicapHappiness + iTradeRouteHappiness + iReligionHappiness + iNaturalWonderHappiness + iExtraHappinessPerCity;

The WinMerge program helps point out where the differences are but I'm not experienced enough to know what part of the UPIII mod needs to merge into the MI - TP mod...

Any help is MUCH appreciated!!