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
   },

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"stats":{"minecraft:killed":{"minecraft:zombie":1,"minecraft:chicken":1,"minecraft:sheep":4,"minecraft:pig":8,"minecraft:cow":13,"minecraft:squid":11,"minecraft:witch":1},"minecraft:dropped":{"minecraft:copper_ore":25,"minecraft:spruce_planks":2,"minecraft:porkchop":5,"minecraft:torch":1,"minecraft:charcoal":3,"minecraft:copper_bars":11,"minecraft:copper_nugget":25},"minecraft:used":{"minecraft:oak_fence":6,"minecraft:birch_slab":30,"minecraft:birch_sign":14,"minecraft:cartography_table":1,"minecraft:oak_boat":2,"minecraft:wheat_seeds":366,"minecraft:birch_planks":10,"minecraft:copper_shovel":1127,"minecraft:writable_book":48,"minecraft:item_frame":3,"minecraft:copper_pickaxe":347,"minecraft:glass_pane":17,"minecraft:furnace":2,"minecraft:cooked_porkchop":8,"minecraft:granite":4,"minecraft:torch":50,"minecraft:dirt":22,"minecraft:sand":1,"minecraft:birch_fence":4,"minecraft:cobblestone_slab":3,"minecraft:oak_slab":6,"minecraft:copper_sword":78,"minecraft:map":1,"minecraft:birch_log":14,"minecraft:oak_log":10,"minecraft:white_wool":3,"minecraft:cobblestone":31,"minecraft:crafting_table":4,"minecraft:chest":3,"minecraft:birch_pressure_plate":2,"minecraft:beetroot_seeds":75,"minecraft:oak_planks":58,"minecraft:oak_sapling":56,"minecraft:egg":4,"minecraft:white_bed":14,"minecraft:sugar_cane":69,"minecraft:copper_axe":439,"minecraft:oak_door":2},"minecraft:mined":{"minecraft:beetroots":35,"minecraft:torch":2,"minecraft:granite":4,"minecraft:bush":2,"minecraft:pumpkin":4,"minecraft:coal_ore":154,"minecraft:wheat":200,"minecraft:oak_planks":6,"minecraft:sugar_cane":98,"minecraft:white_bed":14,"minecraft:gravel":307,"minecraft:short_grass":117,"minecraft:birch_wall_sign":3,"minecraft:oak_leaves":1008,"minecraft:dirt_path":2,"minecraft:birch_slab":1,"minecraft:crafting_table":3,"minecraft:birch_log":45,"minecraft:leaf_litter":9,"minecraft:lilac":1,"minecraft:copper_ore":35,"minecraft:tall_grass":215,"minecraft:tall_seagrass":1,"minecraft:dirt":71,"minecraft:birch_leaves":199,"minecraft:andesite":3,"minecraft:grass_block":192,"minecraft:pink_petals":12,"minecraft:wall_torch":1,"minecraft:sand":278,"minecraft:oak_log":304,"minecraft:birch_planks":1,"minecraft:oak_sapling":2,"minecraft:stone":151},"minecraft:crafted":{"minecraft:birch_fence":6,"minecraft:birch_planks":60,"minecraft:glass_pane":32,"minecraft:map":3,"minecraft:oak_door":3,"minecraft:compass":3,"minecraft:oak_fence":6,"minecraft:oak_slab":12,"minecraft:cooked_porkchop":8,"minecraft:chest":1,"minecraft:air":0,"minecraft:paper":33,"minecraft:copper_shovel":9,"minecraft:furnace":2,"minecraft:oak_boat":2,"minecraft:item_frame":2,"minecraft:cartography_table":1,"minecraft:glass":16,"minecraft:bread":20,"minecraft:cobblestone_slab":6,"minecraft:copper_axe":2,"minecraft:birch_pressure_plate":2,"minecraft:torch":56,"minecraft:white_bed":2,"minecraft:birch_slab":30,"minecraft:oak_planks":40,"minecraft:shears":1,"minecraft:copper_pickaxe":1,"minecraft:birch_sign":9},"minecraft:custom":{"minecraft:time_since_rest":8410,"minecraft:leave_game":4,"minecraft:damage_taken":171,"minecraft:mob_kills":39,"minecraft:boat_one_cm":285850,"minecraft:time_since_death":234710,"minecraft:interact_with_furnace":12,"minecraft:sleep_in_bed":16,"minecraft:total_world_time":396733,"minecraft:swim_one_cm":11396,"minecraft:crouch_one_cm":3021,"minecraft:animals_bred":17,"minecraft:interact_with_crafting_table":37,"minecraft:walk_one_cm":1079262,"minecraft:walk_under_water_one_cm":10205,"minecraft:play_time":234710,"minecraft:damage_dealt":3929,"minecraft:jump":1630,"minecraft:drop":20,"minecraft:interact_with_cartography_table":5,"minecraft:sprint_one_cm":253554,"minecraft:open_chest":53,"minecraft:inspect_hopper":5,"minecraft:fall_one_cm":18807,"minecraft:fly_one_cm":155976,"minecraft:walk_on_water_one_cm":18332,"minecraft:sneak_time":1122},"minecraft:picked_up":{"minecraft:dirt":264,"minecraft:cobblestone":143,"minecraft:flint":34,"minecraft:white_bed":14,"minecraft:gravel":273,"minecraft:sugar_cane":121,"minecraft:birch_sign":3,"minecraft:leather":11,"minecraft:redstone":4,"minecraft:torch":5,"minecraft:birch_slab":1,"minecraft:leaf_litter":78,"minecraft:coal":154,"minecraft:oak_log":304,"minecraft:sand":278,"minecraft:birch_planks":1,"minecraft:birch_log":45,"minecraft:wheat_seeds":579,"minecraft:granite":8,"minecraft:pumpkin":4,"minecraft:egg":7,"minecraft:porkchop":18,"minecraft:ink_sac":28,"minecraft:stick":61,"minecraft:birch_sapling":22,"minecraft:white_wool":11,"minecraft:oak_planks":6,"minecraft:chicken":1,"minecraft:crafting_table":3,"minecraft:raw_copper":124,"minecraft:oak_sapling":99,"minecraft:lilac":1,"minecraft:item_frame":1,"minecraft:rotten_flesh":1,"minecraft:beef":32,"minecraft:andesite":3,"minecraft:beetroot_seeds":95,"minecraft:apple":14,"minecraft:wheat":199,"minecraft:filled_map":1,"minecraft:mutton":5,"minecraft:gunpowder":2,"minecraft:gray_wool":1,"minecraft:pink_petals":32,"minecraft:beetroot":35}},"DataVersion":4554}
-=======
 {"stats":{"minecraft:dropped":{"minecraft:copper_ore":25,"minecraft:oak_planks":8,"minecraft:spruce_planks":2,"minecraft:porkchop":5,"minecraft:torch":1,"minecraft:leaf_litter":8,"minecraft:charcoal":3,"minecraft:copper_nugget":25,"minecraft:copper_bars":11,"minecraft:dirt":9},"minecraft:crafted":{"minecraft:birch_fence":6,"minecraft:birch_planks":60,"minecraft:coal_block":17,"minecraft:glass_pane":32,"minecraft:map":3,"minecraft:charcoal":93,"minecraft:cooked_beef":8,"minecraft:oak_door":3,"minecraft:compass":3,"minecraft:oak_slab":138,"minecraft:oak_fence":6,"minecraft:cooked_porkchop":8,"minecraft:chest":7,"minecraft:cobblestone_wall":18,"minecraft:air":0,"minecraft:copper_hoe":1,"minecraft:paper":33,"minecraft:copper_shovel":18,"minecraft:furnace":7,"minecraft:oak_boat":2,"minecraft:item_frame":2,"minecraft:copper_ingot":16,"minecraft:cartography_table":1,"minecraft:bread":20,"minecraft:glass":16,"minecraft:cobblestone_slab":6,"minecraft:crafting_table":3,"minecraft:copper_axe":9,"minecraft:birch_pressure_plate":2,"minecraft:torch":56,"minecraft:white_bed":2,"minecraft:birch_slab":30,"minecraft:oak_planks":164,"minecraft:deepslate":312,"minecraft:shears":1,"minecraft:copper_pickaxe":2,"minecraft:copper_block":28,"minecraft:birch_sign":9,"minecraft:cobblestone_stairs":80},"minecraft:picked_up":{"minecraft:cobblestone":144,"minecraft:flint":34,"minecraft:white_bed":19,"minecraft:stripped_oak_log":2,"minecraft:sugar_cane":222,"minecraft:birch_sign":3,"minecraft:leather":13,"minecraft:redstone":4,"minecraft:birch_slab":1,"minecraft:granite":8,"minecraft:porkchop":18,"minecraft:ink_sac":28,"minecraft:stick":112,"minecraft:wildflowers":124,"minecraft:chicken":1,"minecraft:lilac":1,"minecraft:item_frame":1,"minecraft:cobbled_deepslate":3,"minecraft:dandelion":13,"minecraft:wheat":368,"minecraft:mutton":5,"minecraft:gunpowder":4,"minecraft:chest":1,"minecraft:pink_petals":32,"minecraft:beetroot":76,"minecraft:dirt":758,"minecraft:gravel":273,"minecraft:torch":8,"minecraft:azure_bluet":52,"minecraft:cobblestone_stairs":1,"minecraft:leaf_litter":134,"minecraft:coal":154,"minecraft:oak_log":629,"minecraft:sand":278,"minecraft:birch_planks":1,"minecraft:birch_log":45,"minecraft:furnace":3,"minecraft:wheat_seeds":1064,"minecraft:pumpkin":4,"minecraft:spider_eye":1,"minecraft:egg":10,"minecraft:birch_sapling":22,"minecraft:white_wool":11,"minecraft:oak_planks":14,"minecraft:crafting_table":4,"minecraft:raw_copper":124,"minecraft:oak_sapling":203,"minecraft:andesite":3,"minecraft:rotten_flesh":1,"minecraft:beef":35,"minecraft:beetroot_seeds":201,"minecraft:apple":20,"minecraft:filled_map":1,"minecraft:gray_wool":1},"minecraft:used":{"minecraft:oak_fence":6,"minecraft:cobbled_deepslate":63,"minecraft:birch_slab":30,"minecraft:birch_sign":14,"minecraft:deepslate":312,"minecraft:cartography_table":1,"minecraft:oak_boat":2,"minecraft:wheat_seeds":539,"minecraft:birch_planks":10,"minecraft:copper_shovel":1842,"minecraft:writable_book":61,"minecraft:copper_pickaxe":355,"minecraft:item_frame":3,"minecraft:glass_pane":17,"minecraft:furnace":7,"minecraft:cooked_porkchop":8,"minecraft:bread":1,"minecraft:granite":4,"minecraft:torch":57,"minecraft:dirt":36,"minecraft:sand":1,"minecraft:cobblestone_stairs":33,"minecraft:birch_fence":4,"minecraft:cobblestone_wall":15,"minecraft:cobblestone_slab":3,"minecraft:oak_slab":6,"minecraft:copper_sword":89,"minecraft:map":1,"minecraft:birch_log":14,"minecraft:oak_log":67,"minecraft:white_wool":3,"minecraft:cobblestone":78,"minecraft:cooked_beef":6,"minecraft:stripped_oak_log":2,"minecraft:crafting_table":8,"minecraft:chest":10,"minecraft:birch_pressure_plate":2,"minecraft:beetroot_seeds":116,"minecraft:oak_planks":58,"minecraft:oak_sapling":133,"minecraft:egg":7,"minecraft:white_bed":20,"minecraft:sugar_cane":69,"minecraft:copper_axe":809,"minecraft:oak_door":2},"minecraft:killed":{"minecraft:zombie":1,"minecraft:creeper":1,"minecraft:chicken":1,"minecraft:sheep":4,"minecraft:pig":8,"minecraft:cow":14,"minecraft:squid":11,"minecraft:witch":1,"minecraft:spider":1},"minecraft:mined":{"minecraft:beetroots":76,"minecraft:torch":4,"minecraft:granite":4,"minecraft:cobblestone_stairs":1,"minecraft:bush":4,"minecraft:chest":1,"minecraft:dandelion":10,"minecraft:pumpkin":4,"minecraft:coal_ore":154,"minecraft:wheat":375,"minecraft:oak_planks":6,"minecraft:cobblestone":1,"minecraft:sugar_cane":162,"minecraft:white_bed":19,"minecraft:gravel":307,"minecraft:short_grass":209,"minecraft:birch_wall_sign":3,"minecraft:oak_leaves":1643,"minecraft:dirt_path":17,"minecraft:furnace":3,"minecraft:birch_slab":1,"minecraft:crafting_table":4,"minecraft:birch_log":45,"minecraft:leaf_litter":25,"minecraft:lilac":1,"minecraft:stripped_oak_log":2,"minecraft:copper_ore":35,"minecraft:tall_grass":316,"minecraft:wildflowers":36,"minecraft:tall_seagrass":1,"minecraft:dirt":87,"minecraft:birch_leaves":200,"minecraft:andesite":3,"minecraft:grass_block":647,"minecraft:pink_petals":12,"minecraft:cobbled_deepslate":1,"minecraLine truncated
->>>>>>> accidental-deletion