diff --git a/clusterio_0.0.2/control.lua b/clusterio_0.0.2/control.lua
index 510467a1..27b26855 100644
--- a/clusterio_0.0.2/control.lua
+++ b/clusterio_0.0.2/control.lua
@@ -318,7 +318,10 @@ remote.add_interface("clusterio",
 	end,
 	importMany = function(jsonString)
 		local items = json:decode(jsonString)
+<<<<<<< HEAD
 		game.print(serpent.block(items))
+=======
+>>>>>>> refs/remotes/origin/json-parser
 		for k, item in pairs(items) do
 			for itemName, itemCount in pairs(item) do
 				GiveItemsToStorage(itemName, itemCount)