diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua
index d7ff4122..be448644 100644
--- a/mods/tnt/init.lua
+++ b/mods/tnt/init.lua
@@ -235,16 +235,11 @@ minetest.register_node("tnt:tnt", {
 	sounds = default.node_sound_wood_defaults(),
 	on_punch = function(pos, node, puncher)
 		if puncher:get_wielded_item():get_name() == "default:torch" then
-<<<<<<< HEAD
 			if(minetest.check_player_privs(puncher:get_player_name(), {trusted_player=true})) then
 				minetest.sound_play("tnt_ignite", {pos=pos})
 				minetest.set_node(pos, {name="tnt:tnt_burning"})
 				minetest.get_node_timer(pos):start(4)
 			end
-=======
-			minetest.sound_play("tnt_ignite", {pos=pos})
-			minetest.set_node(pos, {name="tnt:tnt_burning"})
->>>>>>> dfee51c21e1131c9c80fc7382b000954962f8b49
 		end
 	end,
 	on_blast = function(pos, intensity)