--- deliantra/server/common/object.C	2008/05/18 19:53:07	1.245
+++ deliantra/server/common/object.C	2008/05/22 15:37:44	1.246
@@ -188,10 +188,6 @@
       || ob1->name  != ob2->name)
     return 0;
 
-  // some objects are unmergable
-  if (!ob1->nrof || !ob2->nrof)
-    return 0;
-
   /* Do not merge objects if nrof would overflow. First part checks
    * for unsigned overflow (2c), second part checks whether the result
    * would fit into a 32 bit signed int, which is often used to hold