--- deliantra/server/include/object.h	2006/12/13 03:28:42	1.51
+++ deliantra/server/include/object.h	2006/12/13 03:29:45	1.52
@@ -257,8 +257,8 @@
   // this is often used in time-critical code, so optimise
   static bool can_merge (object *op1, object *op2)
   {
-    return op1->value != op2->value
-        && op1->name  != op2->name
+    return op1->value == op2->value
+        && op1->name  == op2->name
         && can_merge_slow (op1, op2);
   }