diff --git a/src/main/java/com/github/halotroop/litecraft/types/block/Block.java b/src/main/java/com/github/halotroop/litecraft/types/block/Block.java
index 6a785fb..179111e 100644
--- a/src/main/java/com/github/halotroop/litecraft/types/block/Block.java
+++ b/src/main/java/com/github/halotroop/litecraft/types/block/Block.java
@@ -11,7 +11,7 @@ public class Block
 	{ // add properties to this builder!
 		private boolean visible = true;
 		private boolean fullCube = true;
-		private boolean canCaveCarve = false;
+		private boolean canCaveCarve = true;
 		private final String identifier;
 
 		public Properties(String identifier)
@@ -29,9 +29,9 @@ public class Block
 			return this;
 		}
 
-		public Properties canCaveCarve(boolean canCaveCarve)
+		public Properties cannotCarveCave()
 		{
-			this.canCaveCarve = canCaveCarve;
+			this.canCaveCarve = false;
 			return this;
 		}
 	}
diff --git a/src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java b/src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java
index 6d9443c..e2637c4 100644
--- a/src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java
+++ b/src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java
@@ -4,23 +4,14 @@ import com.github.halotroop.litecraft.types.block.Block.Properties;
 
 public final class Blocks
 {
-<<<<<<< Upstream, based on branch 'liteCraft' of https://github.com/halotroop/Ginger3D.git
-	public static final Block AIR = new Block(new Properties("air").visible(false));
-	public static final Block GRASS = new Block(new Properties("block/cubes/soil/grass/grass_top.png").canCaveCarve(true));
-	public static final Block DIRT = new Block("block/cubes/soil/dirt.png", new Properties("dirt").canCaveCarve(true));
-	public static final Block ANDESITE = new Block("block/cubes/stone/basic/andesite.png", new Properties("andesite").canCaveCarve(true));
-	public static final Block DIORITE = new Block("block/cubes/stone/basic/diorite.png", new Properties("diorite").canCaveCarve(true));
-	public static final Block GRANITE = new Block("block/cubes/stone/basic/granite.png", new Properties("granite").canCaveCarve(true));
-	public static final Block GNEISS = new Block("block/cubes/stone/basic/gneiss.png", new Properties("gneiss").canCaveCarve(true));
-
-=======
-	public static final Block AIR = new Block(new Properties("air").visible(false).fullCube(false));
+	public static final Block AIR = new Block(new Properties("air").visible(false).fullCube(false).cannotCarveCave());
+	public static final Block GRASS = new Block(new Properties("block/cubes/soil/grass/grass_top.png"));
 	public static final Block DIRT = new Block("block/cubes/soil/dirt.png", new Properties("dirt"));
 	public static final Block ANDESITE = new Block("block/cubes/stone/basic/andesite.png", new Properties("andesite"));
 	public static final Block DIORITE = new Block("block/cubes/stone/basic/diorite.png", new Properties("diorite"));
 	public static final Block GRANITE = new Block("block/cubes/stone/basic/granite.png", new Properties("granite"));
 	public static final Block GNEISS = new Block("block/cubes/stone/basic/gneiss.png", new Properties("gneiss"));
->>>>>>> 56b16c1 Made chunks add blocks next to all non-full cubes to the render list
+
 	public static Block init()
 	{
 		return AIR;