--- Ni_Karma.lua	2009-08-10 22:25:36.000000000 -0700
+++ Ni_Karma.lua.new	2009-08-10 22:26:47.000000000 -0700
@@ -36597,17 +36597,11 @@
 				["DT"] = "07/18/09 02:06:32",
 				["reason"] = "",
 			}, -- [41]
-			{
-				["value"] = 25,
-				["type"] = "P",
-				["reason"] = "hello",
-				["DT"] = "08/10/09 22:24:19",
-			}, -- [42]
-			["lifetime"] = 255,
+			["lifetime"] = 230,
 			["fullname"] = "Dieliana",
-			["points"] = 100,
+			["points"] = 75,
 			["class"] = "Priest",
-			["lastadd"] = "08/10/09 22:24:19",
+			["lastadd"] = "07/18/09 02:06:32",
 		},
 		["zezz"] = {
 			{
@@ -43654,11 +43648,17 @@
 				["DT"] = "07/31/09 23:54:19",
 				["reason"] = "",
 			}, -- [123]
-			["lifetime"] = 890,
+			{
+				["value"] = 25,
+				["type"] = "P",
+				["reason"] = "merge test",
+				["DT"] = "08/11/09 01:26:35",
+			}, -- [124]
+			["lifetime"] = 915,
 			["fullname"] = "Uhdollar",
 			["class"] = "Druid",
-			["points"] = 225,
-			["lastadd"] = "07/31/09 23:54:19",
+			["points"] = 250,
+			["lastadd"] = "08/11/09 01:26:35",
 		},
 		["facturs"] = {
 			{