diff --git a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java b/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java
index 4a8ad413..b435489f 100644
--- a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java
+++ b/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java
@@ -1,10 +1,16 @@
 package ru.betterend.blocks;
 
+import net.minecraft.world.gen.feature.Feature;
 import ru.betterend.blocks.basis.BlockFeatureSapling;
 import ru.betterend.registry.FeatureRegistry;
 
 public class BlockMossyGlowshroomSapling extends BlockFeatureSapling {
 	public BlockMossyGlowshroomSapling() {
-		super(FeatureRegistry.MOSSY_GLOWSHROOM, 7);
+		super(7);
+	}
+
+	@Override
+	protected Feature<?> getFeature() {
+		return FeatureRegistry.MOSSY_GLOWSHROOM.getFeature();
 	}
 }
diff --git a/src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java b/src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java
index 91827fa3..c745e624 100644
--- a/src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java
@@ -8,9 +8,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.DefaultBiomeCreator;
 import net.minecraft.world.biome.GenerationSettings;
+<<<<<<< HEAD
 import net.minecraft.world.gen.GenerationStep;
 
 import ru.betterend.registry.FeatureRegistry;
+=======
+>>>>>>> 9dcf8c34a09f9ca40aa61ba17f5142561e464dbf
 
 @Mixin(DefaultBiomeCreator.class)
 public abstract class DefaultBiomeCreatorMixin {