diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 9df88bd2f..edd6f3ae3 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -716,7 +716,6 @@
         "n": 1000
       }
     ],
-<<<<<<< HEAD
     "buzkashi_resurrection": 10,
     "favorability_attenuation": [
       {
@@ -732,8 +731,5 @@
         "v": 500
       }
     ]
-=======
-    "buzkashi_resurrection": 10
->>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 91c368613..2d3963ce6 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -476,7 +476,7 @@
     "SameID": false,
     "golbalbufficon": "",
     "buffIcon": "ty_zd_buff_j008",
-    "buffeffect": "effect_jiaoxia_jiaobing",
+    "buffeffect": "effect_buff_bingdong",
     "buffpos": "脚底"
   },
   {
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 87c169344..76dc46387 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -222,10 +222,7 @@ type GameGlobalData struct {
     BuzkashiVintegral []*Gameatn
     BuzkashiFintegral []*Gameatn
     BuzkashiResurrection int32
-<<<<<<< HEAD
     FavorabilityAttenuation []*Gamekv
-=======
->>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -914,7 +911,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
             }
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_resurrection"].(float64); !_ok_ { err = errors.New("buzkashi_resurrection error"); return }; _v.BuzkashiResurrection = int32(_tempNum_) }
-<<<<<<< HEAD
      {
                 var _arr_ []interface{}
                 var _ok_ bool
@@ -929,8 +925,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
-=======
->>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31
     return
 }