I merged the python and xml too, but for the UnitInfo.xml file I gave a quick look in it with windiff to see the the difference between the GiantEarthMap one and the 0.6 one, it seemed that all the change made by unnoficial patch were already integrated; and the only differences it still had were the change of GiantEarthMap so I kept the GiantEarthMap one. But as I said I gave a quick look on it, if you want you can do a double check in the case I forgot on or two unoficial patch modifications.
Armand.