diff --git a/mods/maptools/nodes.lua b/mods/maptools/nodes.lua
index 63eea994..ad5ff1f1 100644
--- a/mods/maptools/nodes.lua
+++ b/mods/maptools/nodes.lua
@@ -411,7 +411,6 @@ minetest.register_node("maptools:igniter", {
 minetest.register_node("maptools:superapple", {
 	description = S("Super Apple"),
 	range = 12,
-<<<<<<< HEAD
 	stack_max = 99,
 	drawtype = "nodebox",
 	visual_scale = 1.0,
@@ -442,21 +441,4 @@ minetest.register_node("maptools:superapple", {
 			minetest.set_node(pos, {name = "maptools:superapple", param2= 1})
 		end
 	end,
-=======
-	stack_max = 10000,
-	drawtype = "plantlike",
-	visual_scale = 1.0,
-	tiles = {"maptools_superapple.png"},
-	inventory_image = "maptools_superapple.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
-	},
-	walkable = false,
-	groups = {fleshy=3, dig_immediate=3, not_in_creative_inventory = maptools.creative},
-	on_use = minetest.item_eat(20),
-	sounds = default.node_sound_defaults(),
->>>>>>> Maptool's update
 })
diff --git a/mods/moreores/init.lua b/mods/moreores/init.lua
index f1d3080f..921834fa 100755
--- a/mods/moreores/init.lua
+++ b/mods/moreores/init.lua
@@ -241,7 +241,7 @@ local oredefs = {
 			},
 		tools = {
 			pick = {
-				cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2}},
+				cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2},
 				damage_groups = {fleshy = 3},
 				full_punch_interval = 0.8,
 			},
@@ -249,20 +249,20 @@ local oredefs = {
 				uses = 300
 			},
 			shovel = {
-				crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel= 1}
+				crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel= 1},
 				damage_groups = {fleshy = 3},
 				full_punch_interval = 0.8,
 			},
 			axe = {
 				choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel= 1},
-				fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel= 1}
+				fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel= 1},
 				damage_groups = {fleshy = 3},
 				full_punch_interval = 0.8,
 			},
 			sword = {
 				fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1},
 				snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1},
-				choppy = {times = {[3] = 0.80}, uses = 40, maxlevel= 0}
+				choppy = {times = {[3] = 0.80}, uses = 40, maxlevel= 0},
 				damage_groups = {fleshy = 5},
 				full_punch_interval = 0.85,
 			}
@@ -290,25 +290,25 @@ local oredefs = {
 			},
 		tools = {
 			pick = {
-				cracky = {times = {[1] = 1.5, [2] = 0.8, [3] = 0.35}, uses = 200, maxlevel= 3}
+				cracky = {times = {[1] = 1.5, [2] = 0.8, [3] = 0.35}, uses = 200, maxlevel= 3},
 				damage_groups = {fleshy = 5},
 			},
 			hoe = {
 				uses = 1000
 			},
 			shovel = {
-				crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 1}
+				crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 1},
 				damage_groups = {fleshy = 5},
 			},
 			axe = {
 				choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel= 1},
-				fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1}
+				fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1},
 				damage_groups = {fleshy = 5},
 			},
 			sword = {
 				fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 1},
 				snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 1},
-				choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0}
+				choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0},
 				damage_groups = {fleshy = 9},
 			}
 		},