diff --git a/ui/map/map.gd b/ui/map/map.gd
index 4b85850..d08c630 100644
--- a/ui/map/map.gd
+++ b/ui/map/map.gd
@@ -6,7 +6,8 @@ func create_map():
 	
 	Global.print_debug("Create river")
 	var river = {"size": 3, "color": "blue"}
-
+	print(terrain)
+	print("a")
 	terrain.get_edge(16).set_data("river", river)
 	
 	var triangle_idx = 5
diff --git a/world/game.gd b/world/game.gd
index bbbfecd..afabdcc 100644
--- a/world/game.gd
+++ b/world/game.gd
@@ -24,7 +24,11 @@ func _ready():
 	noise.octaves = octaves
 	terrain = Terrain.new(width,height,spacing,true)
 	init_points_data()
+<<<<<<< HEAD
 	# print(terrain.get_point(3))
+=======
+	print(terrain)
+>>>>>>> 7594b7d05c95e46157d72da7c31083c3111996b1
 	emit_signal("world_loaded", terrain)
 
 func init_points_data():