There seem to be merge conflict markers in TerrainTypes.xml, KingdomSpecialImprovements.xml, and KingdomUniqueImprovements.xml :
<AllowedPerCity>1</AllowedPerCity>
<<<<<<< KingdomSpecialImprovements.xml
<ReqCityLevel>1</ReqCityLevel>
=======
<ReqCityLevel>3</ReqCityLevel>
>>>>>>> 1.123
<!-- Medallion Data -->
<Medallions InternalName="">
Lazy search under data\English\ :
>grep -R -n "^>>>" .
./Core Improvements/KingdomSpecialImprovements.xml:245:>>>>>>> 1.123
./Core Improvements/KingdomSpecialImprovements.xml:494:>>>>>>> 1.112
./Core Improvements/KingdomSpecialImprovements.xml:726:>>>>>>> 1.110
./Core Improvements/KingdomSpecialImprovements.xml:1733:>>>>>>> 1.123
./Core Improvements/KingdomSpecialImprovements.xml:1904:>>>>>>> 1.110
./Core Improvements/KingdomSpecialImprovements.xml:2019:>>>>>>> 1.123
./Core Improvements/KingdomSpecialImprovements.xml:2134:>>>>>>> 1.123
./Core Improvements/KingdomSpecialImprovements.xml:2371:>>>>>>> 1.123
./Core Improvements/KingdomSpecialImprovements.xml:2645:>>>>>>> 1.123
./Core Improvements/KingdomUniqueImprovements.xml:209:>>>>>>> 1.51
./Core Improvements/KingdomUniqueImprovements.xml:215:>>>>>>> 1.58
./Core Improvements/KingdomUniqueImprovements.xml:217:>>>>>>> 1.50
./Core Improvements/KingdomUniqueImprovements.xml:378:>>>>>>> 1.50
./Core Improvements/KingdomUniqueImprovements.xml:442:>>>>>>> 1.50
./Core Improvements/KingdomUniqueImprovements.xml:553:>>>>>>> 1.56
./Core Improvements/KingdomUniqueImprovements.xml:684:>>>>>>> 1.56
./TerrainTypes.xml:285:>>>>>>> 1.54
I'm not seeing errors in-game, but I'm not sure how the game's parser handles this (and whether these improvements are behaving correctly).
I noticed this because someone mentioned that the Temple of Essence improvement wasn't adding essence, possibly because of the 1.25 value used in the xml for the improvement, vs. the 10 value used for the Channeling tech (If 10=10%, then 25=25%, and 1.25=not 25%) ?
