diff --git a/.github/versions.json b/.github/versions.json
index 090b3f87d..8c20944a3 100644
--- a/.github/versions.json
+++ b/.github/versions.json
@@ -1,8 +1,5 @@
 {
-<<<<<<< HEAD
 	"1.19.3": "1.8.4",
-=======
->>>>>>> 1.19.2
 	"1.19.2": "1.8.4",
 	"1.19.1": "1.8.4",
 	"1.19": "1.8.4",
diff --git a/common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesItems.java b/common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesItems.java
index c905e4fd1..ba8f9c60c 100644
--- a/common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesItems.java
+++ b/common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesItems.java
@@ -125,7 +125,7 @@ private static void addToItemGroups() {
 		RegistryHelper.addToItemGroupAfter(ItemGroups.REDSTONE, WAXED_COPPER_BUTTON.get(), OXIDIZED_COPPER_BUTTON.get());
 		RegistryHelper.addToItemGroupAfter(ItemGroups.REDSTONE, WAXED_EXPOSED_COPPER_BUTTON.get(), WAXED_COPPER_BUTTON.get());
 		RegistryHelper.addToItemGroupAfter(ItemGroups.REDSTONE, WAXED_WEATHERED_COPPER_BUTTON.get(), WAXED_EXPOSED_COPPER_BUTTON.get());
-		RegistryHelper.addToItemGroupAfter(ItemGroups.REDSTONE, WAXED_OXIDIZED_COPPER_BUTTON.get(), WAXED_OXIDIZED_COPPER_BUTTON.get());
+		RegistryHelper.addToItemGroupAfter(ItemGroups.REDSTONE, WAXED_OXIDIZED_COPPER_BUTTON.get(), WAXED_WEATHERED_COPPER_BUTTON.get());
 		RegistryHelper.addToItemGroupAfter(ItemGroups.REDSTONE, EXPOSED_LIGHTNING_ROD.get(), Items.LIGHTNING_ROD);
 		RegistryHelper.addToItemGroupAfter(ItemGroups.REDSTONE, WEATHERED_LIGHTNING_ROD.get(), EXPOSED_LIGHTNING_ROD.get());
 		RegistryHelper.addToItemGroupAfter(ItemGroups.REDSTONE, OXIDIZED_LIGHTNING_ROD.get(), WEATHERED_LIGHTNING_ROD.get());