should be corrected now

advancements/2e697487-f13e-43f6-91b7-09b1f01ad3ba.json

@@ -534,13 +534,9 @@
   "minecraft:adventure/kill_all_mobs": {
     "criteria": {
       "minecraft:witch": "2025-10-11 00:45:07 -0600",
-<<<<<<< HEAD
-      "minecraft:zombie": "2025-10-11 00:59:45 -0600"
-=======
       "minecraft:spider": "2025-10-14 20:12:01 -0600",
       "minecraft:zombie": "2025-10-11 00:59:45 -0600",
       "minecraft:creeper": "2025-10-14 20:12:28 -0600"
->>>>>>> accidental-deletion
     },
     "done": false
   },
@@ -1152,13 +1148,9 @@
   },
   "minecraft:husbandry/balanced_diet": {
     "criteria": {
-<<<<<<< HEAD
-      "cooked_porkchop": "2025-10-11 01:20:33 -0600"
-=======
       "cooked_porkchop": "2025-10-11 01:20:33 -0600",
       "bread": "2025-10-14 20:18:00 -0600",
       "cooked_beef": "2025-10-14 19:20:16 -0600"
->>>>>>> accidental-deletion
     },
     "done": false
   },
@@ -1654,15 +1646,6 @@
     },
     "done": true
   },
-<<<<<<< HEAD
-  "minecraft:recipes/decorations/glow_item_frame": {
-    "criteria": {
-      "has_item_frame": "2025-10-13 12:27:23 -0600"
-    },
-    "done": true
-  },
-=======
->>>>>>> accidental-deletion
   "minecraft:recipes/decorations/gray_carpet": {
     "criteria": {
       "has_gray_wool": "2025-10-13 12:05:54 -0600"
@@ -1672,8 +1655,6 @@
   "minecraft:recipes/decorations/gray_banner": {
     "criteria": {
       "has_gray_wool": "2025-10-13 12:05:54 -0600"
-<<<<<<< HEAD
-=======
     },
     "done": true
   },
@@ -2094,7 +2075,6 @@
   "minecraft:recipes/tools/diamond_axe": {
     "criteria": {
       "has_diamond": "2025-10-14 20:23:46 -0600"
->>>>>>> accidental-deletion
     },
     "done": true
   },