diff --git a/README.md b/README.md
index 0ddb6d6..bb6fa0f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,11 @@
 
 为FZ服务器写的Minecraft生存辅助数据包
 
+<<<<<<< HEAD
 [![数据包版本](https://img.shields.io/badge/正式版-3.1.12-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
+=======
+[![数据包版本](https://img.shields.io/badge/正式版-3.1.11-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20|1.21+-blue.svg)](https://minecraft.net/)
+>>>>>>> 82b1f0dcddcbfbb46d1ab272ded9c453531be507
 
 > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
 
diff --git a/compat_42/data/fzsd/tags/entity_type/ignore_on_player_killed_entity.json b/compat_42/data/fzsd/tags/entity_type/ignore_on_player_killed_entity.json
new file mode 100644
index 0000000..8206c95
--- /dev/null
+++ b/compat_42/data/fzsd/tags/entity_type/ignore_on_player_killed_entity.json
@@ -0,0 +1,12 @@
+{
+    "replace": false,
+    "values": [
+        "minecraft:armor_stand",
+        "minecraft:boat",
+        "minecraft:shulker_bullet",
+        "minecraft:item_frame",
+        "minecraft:glow_item_frame",
+        "minecraft:painting",
+        "minecraft:end_crystal"
+    ]
+}
\ No newline at end of file
diff --git a/data/fzsd/advancement/game_event/on_killed_mob_or_player.json b/data/fzsd/advancement/game_event/on_killed_mob_or_player.json
index ab17360..fc4418c 100644
--- a/data/fzsd/advancement/game_event/on_killed_mob_or_player.json
+++ b/data/fzsd/advancement/game_event/on_killed_mob_or_player.json
@@ -21,15 +21,7 @@
                             }
                         }
                     }
-                ],
-                "killing_blow": {
-                    "tags": [
-                        {
-                            "expected": false,
-                            "id": "bypasses_invulnerability"
-                        }
-                    ]
-                }
+                ]
             }
         }
     },
diff --git a/data/fzsd/tags/entity_type/ignore_on_player_killed_entity.json b/data/fzsd/tags/entity_type/ignore_on_player_killed_entity.json
index 46e01c5..06047c6 100644
--- a/data/fzsd/tags/entity_type/ignore_on_player_killed_entity.json
+++ b/data/fzsd/tags/entity_type/ignore_on_player_killed_entity.json
@@ -2,7 +2,7 @@
     "replace": false,
     "values": [
         "minecraft:armor_stand",
-        "minecraft:boat",
+        "#minecraft:boat",
         "minecraft:minecart",
         "minecraft:shulker_bullet",
         "minecraft:item_frame",