diff --git a/init.lua b/init.lua
index ed580b6..0664f06 100644
--- a/init.lua
+++ b/init.lua
@@ -2879,7 +2879,6 @@ else
 			return itemstack
 		end
 	})
->>>>>>> upstream/master
 end
 
 minetest.register_node("witchcraft:potion_magenta", {