diff --git a/config/voidislandcontrol.cfg b/config/voidislandcontrol.cfg
index 269d85f..f9a6e8d 100644
--- a/config/voidislandcontrol.cfg
+++ b/config/voidislandcontrol.cfg
@@ -97,12 +97,8 @@
         I:islandSize=5
 
         # Valids are random, sand, snow, wood, grass, gog, or others added by addons/custom islands
-<<<<<<< Updated upstream
-        S:islandSpawnType=grass
-=======
         S:islandSpawnType=wood
->>>>>>> Stashed changes
-
+		
         # Y Level to spawn islands at (Set to 2 above where you want the ground block)
         I:islandYLevel=88