# Conflicts: # Unity/Assets/Scripts/TH1_Data/PlayerData.cs # Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoHeroPickedRowMono.cs
# Conflicts: # Unity/Assets/Scripts/TH1_Data/PlayerData.cs # Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoHeroPickedRowMono.cs