diff --git a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
index 9ad62545c..bd65c3919 100644
--- a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
+++ b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
@@ -18,10 +18,6 @@
 
 package com.volmit.iris.util.decree;
 
-<<<<<<< Updated upstream
-=======
-import com.volmit.iris.engine.object.biome.IrisBiome;
->>>>>>> Stashed changes
 import org.bukkit.entity.Player;
 
 public class EXAMPLE