diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js
index 6bb79dbb7..4f968186f 100644
--- a/kubejs/client_scripts/constants.js
+++ b/kubejs/client_scripts/constants.js
@@ -1,111 +1 @@
 // priority: 200
-<<<<<<< HEAD
-
-// some constants
-=======
-const minecraftItemsToHide = [
-    "minecraft:coal_ore",
-    "minecraft:deepslate_coal_ore",
-    "minecraft:iron_ore",
-    "minecraft:deepslate_iron_ore",
-    "minecraft:copper_ore",
-    "minecraft:deepslate_copper_ore",
-    "minecraft:gold_ore",
-    "minecraft:deepslate_gold_ore",
-    "minecraft:redstone_ore",
-    "minecraft:deepslate_redstone_ore",
-    "minecraft:emerald_ore",
-    "minecraft:deepslate_emerald_ore",
-    "minecraft:lapis_ore",
-    "minecraft:deepslate_lapis_ore",
-    "minecraft:diamond_ore",
-    "minecraft:deepslate_diamond_ore",
-    "minecraft:nether_gold_ore",
-    "minecraft:nether_quartz_ore",
-    "minecraft:ancient_debris",
-    "minecraft:netherite_helmet",
-    "minecraft:netherite_chestplate",
-    "minecraft:netherite_leggings",
-    "minecraft:netherite_boots",
-]
-
-const createItemsToHide = [
-    "create:zinc_ore",
-    "create:deepslate_zinc_ore",
-    "create:crushed_raw_silver",
-    "create:crushed_raw_tin",
-    "create:crushed_raw_nickel",
-    "create:copper_sheet",
-    "create:brass_sheet",
-    "create:iron_sheet",
-    "create:golden_sheet",
-    "create:zinc_ingot",
-    "create:brass_ingot",
-]
-
-const stoneTypesToHide = [
-    "sand",
-    "red_sand",
-    "gravel",
-    "ore",
-    "deepslate",
-    "basalt",
-    "endstone",
-    "netherrack",
-    "andesite",
-    "diorite",
-    "granite",
-    "tuff"
-]
-
-const tfcSimpleMaterials = [
-    "gypsum",
-    "cinnabar",
-    "cryolite",
-    "saltpeter",
-    "sylvite",
-    "borax",
-    "halite",
-    "amethyst",
-    "opal",
-    "pyrite",
-    "topaz",
-    "bituminous_coal",
-    "lignite",
-    "graphite",
-    "sulfur",
-    "diamond",
-    "emerald",
-    "lapis_lazuli",
-    "ruby",
-    "sapphire"
-]
-
-const tfcOreTypes = [
-    "poor",
-    "normal",
-    "rich"
-]
-
-const tfcOreMaterials = [
-    "bismuthinite",
-    "cassiterite",
-    "garnierite",
-    "hematite",
-    "limonite",
-    "magnetite",
-    "malachite",
-    "native_copper",
-    "native_gold",
-    "native_silver",
-    "sphalerite",
-    "tetrahedrite"
-]
-
-const tfcDepositeMaterials = [
-    "cassiterite",
-    "native_copper",
-    "native_gold",
-    "native_silver"
-]
->>>>>>> 92570c6f6c571dff991711daf527a130633ca759