diff --git a/Datas/pro2d/FavorabilityDataConfig.xlsx b/Datas/pro2d/FavorabilityDataConfig.xlsx
deleted file mode 100644
index 35ddc67..0000000
Binary files a/Datas/pro2d/FavorabilityDataConfig.xlsx and /dev/null differ
diff --git a/Datas/pro2d/favorability/FavorabilityDataConfig.xlsx b/Datas/pro2d/favorability/FavorabilityDataConfig.xlsx
new file mode 100644
index 0000000..e422f07
Binary files /dev/null and b/Datas/pro2d/favorability/FavorabilityDataConfig.xlsx differ
diff --git a/Datas/pro2d/hero.xlsx b/Datas/pro2d/hero.xlsx
index 4d4abd4..b5e75c1 100644
Binary files a/Datas/pro2d/hero.xlsx and b/Datas/pro2d/hero.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index a29a639..4c18b1b 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -580,12 +580,8 @@
         <var name="ArmorType" type="(list#sep==),int"/>
         <var name="ShoesType" type="(list#sep==),int"/>
         <var name="CoupleTiesID" type="int"/>
-<<<<<<< HEAD
-        <var name="LikabilityMaxLevel" type="int"/>
-=======
         <var name="FavorabilityID" type="string"/>
->>>>>>> e4dfabea8ccf36a2b635c861249f594ebe48c61d
-
+		
         <var name="atks" type="map,NumericType,int"/>
         <var name="defs" type="map,NumericType,int"/>
     </bean>
@@ -1213,7 +1209,7 @@
     </bean>
 
     <bean name="FavorabilityDataConfig">
-        <var name="FAID" type="string"/>
+        <var name="FAID" type="int"/>
         <var name="LevelDatas" type="map,int,LevelData"/>
     </bean>
 	
@@ -1328,5 +1324,5 @@
     <table name="TbCompassDatas" value="CompassDatas" input="pro2d/CompassDatas.xlsx"/>
     <table name="TbLanguage" value="Language" input="pro2d/Language.xlsx"/>
     <table name="TbCompassSkillConfig" value="CompassSkillConfig" input="pro2d/CompassSkillConfig.xlsx"/>
-    <table name="TbFavorabilityDataConfig" value="FavorabilityDataConfig" input="pro2d/FavorabilityDataConfig.xlsx"/>
+    <table name="TbFavorabilityDataConfig" value="FavorabilityDataConfig" input="pro2d/favorability/FavorabilityDataConfig.xlsx"/>
 </module>
\ No newline at end of file
--
libgit2 0.21.2