From 8737b0d984611bb38676ddec61b932a4d7e00bba Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Sun, 25 Apr 2021 17:12:42 -0700
Subject: [PATCH] resolve merge conflict

---
 common/src/test/java/biome/DistributionTest.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/src/test/java/biome/DistributionTest.java b/common/src/test/java/biome/DistributionTest.java
index 711aba9c7..227afe1df 100644
--- a/common/src/test/java/biome/DistributionTest.java
+++ b/common/src/test/java/biome/DistributionTest.java
@@ -40,6 +40,7 @@ import com.dfsek.terra.config.loaders.config.sampler.NoiseSamplerBuilderLoader;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.AbstractableTemplate;
 import com.dfsek.terra.config.templates.BiomeTemplate;
+import com.dfsek.terra.profiler.Profiler;
 import com.dfsek.terra.registry.config.BiomeRegistry;
 import com.dfsek.terra.registry.config.NoiseRegistry;
 import com.dfsek.terra.world.TerraWorld;
@@ -137,6 +138,11 @@ public class DistributionTest {
             return null;
         }
 
+        @Override
+        public Profiler getProfiler() {
+            return null;
+        }
+
         @Override
         public void register(TypeRegistry registry) {