diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index 65e53fd93..ad2d390a1 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -8838,6 +8838,7 @@
     "Callback": [
       934002311
     ]
+<<<<<<< HEAD
   },
   {
     "Id": 481300223,
@@ -8898,5 +8899,7 @@
     "Callback": [
       814003214
     ]
+=======
+>>>>>>> 61db84522abaac01acc58fffb57e5601d35ad929
   }
 ]
\ No newline at end of file