diff --git a/HEADS b/HEADS
index b665208a..242c68e7 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "42e40a7d3c0cbac92720dbfcee10cc4ceb59ec74"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "0f709b5455411652f371879e83a0737589d690c3"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "dbf3c59a9c52f155f0d98b567d571708e8b3f253"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "3199cbe1a52e9d5714106e0332897ebac7a42496"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "0eee4dba90e486ee7abd8039220d86f742a2fb6a"}, "mesh_utils": {"master": "29c5cc9a75af4506dfd44ae4c919a0771240dfb0"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "e5c860e578ca2461a8a4fb7615a00fe433403340"}}
\ No newline at end of file
+{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "42e40a7d3c0cbac92720dbfcee10cc4ceb59ec74"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "0f709b5455411652f371879e83a0737589d690c3"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "3199cbe1a52e9d5714106e0332897ebac7a42496"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "0eee4dba90e486ee7abd8039220d86f742a2fb6a"}, "mesh_utils": {"master": "29c5cc9a75af4506dfd44ae4c919a0771240dfb0"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "2cbb13ea58122eed2f77c89a23ee3711f4248104"}}
\ No newline at end of file
diff --git a/game/modules/core/materials/6_standard_material_prop_nouv2.tres b/game/modules/core/materials/6_standard_material_prop_nouv2.tres
index d865fa75..9087222b 100644
--- a/game/modules/core/materials/6_standard_material_prop_nouv2.tres
+++ b/game/modules/core/materials/6_standard_material_prop_nouv2.tres
@@ -1,9 +1,7 @@
-[gd_resource type="ShaderMaterial" load_steps=3 format=2]
+[gd_resource type="ShaderMaterial" load_steps=2 format=2]
 
 [ext_resource path="res://modules/core/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1]
-[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=2]
 
 [resource]
 shader = ExtResource( 1 )
 shader_param/albedo = Color( 1, 1, 1, 1 )
-shader_param/texture_albedo = ExtResource( 2 )
diff --git a/game/modules/planets/test_planet/biomes/2_tdungb.tres b/game/modules/planets/test_planet/biomes/2_tdungb.tres
index 1e84d20c..988c9959 100644
--- a/game/modules/planets/test_planet/biomes/2_tdungb.tres
+++ b/game/modules/planets/test_planet/biomes/2_tdungb.tres
@@ -1,10 +1,12 @@
-[gd_resource type="Biome" load_steps=4 format=2]
+[gd_resource type="Biome" load_steps=5 format=2]
 
 [ext_resource path="res://modules/planets/test_planet/biomes/simple_biome.gd" type="Script" id=1]
 [ext_resource path="res://modules/planets/test_planet/villages/village.tres" type="Building" id=2]
 [ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="PropData" id=3]
+[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2.tres" type="PropData" id=4]
 
 [resource]
 buildings = [ ExtResource( 2 ) ]
 script = ExtResource( 1 )
 prop_tree = ExtResource( 3 )
+prop_tree2 = ExtResource( 4 )
diff --git a/game/modules/planets/test_planet/biomes/simple_biome.gd b/game/modules/planets/test_planet/biomes/simple_biome.gd
index 5a277e26..dfd5cf41 100644
--- a/game/modules/planets/test_planet/biomes/simple_biome.gd
+++ b/game/modules/planets/test_planet/biomes/simple_biome.gd
@@ -23,6 +23,7 @@ extends Biome
 
 export(PackedScene) var tree : PackedScene
 export(PropData) var prop_tree : PropData
+export(PropData) var prop_tree2 : PropData
 
 var terrarin_gen : BiomeTerrarinGenerator = BiomeTerrarinGenerator.new()
 
@@ -38,6 +39,7 @@ func _setup():
 func _instance(p_seed, p_instance):
 	p_instance.tree = tree
 	p_instance.prop_tree = prop_tree
+	p_instance.prop_tree2 = prop_tree2
 	
 	return ._instance(p_seed, p_instance)
 		
@@ -126,4 +128,10 @@ func gen_terra_chunk(chunk: TerraChunk) -> void:
 					tr.origin = Vector3((x + chunk.position_x * chunk.size_x), ((val - 2) / 255.0) * chunk.world_height, (z + chunk.position_z * chunk.size_z))
 
 					chunk.voxel_world.prop_add(tr, prop_tree)
+
+#					Uncomment to test the prop texture merger system:
+#					if randf() > 0.5:
+#						chunk.voxel_world.prop_add(tr, prop_tree)
+#					else:
+#						chunk.voxel_world.prop_add(tr, prop_tree2)