FIX: Workaround for bug 109 (problems with xml representations of list values)

src/caosdb/apiutils.py

@@ -742,9 +742,16 @@ def merge_entities(entity_a: Entity, entity_b: Entity):
                 else:
                     raise RuntimeError("Merge conflict.")
         else:
-            entity_a.add_property(
-                entity_b.get_property(key),
-                importance=entity_b.get_importance(key))
+           # TODO: This is a temporary FIX for
+           #       https://gitlab.indiscale.com/caosdb/src/caosdb-pylib/-/issues/105
+           entity_a.add_property(id=entity_b.get_property(key).id,
+                                 name=entity_b.get_property(key).name,
+                                 datatype=entity_b.get_property(key).datatype,
+                                 value=entity_b.get_property(key).value,
+                                 importance=entity_b.get_importance(key))
+            # entity_a.add_property(
+            #     entity_b.get_property(key),
+            #     importance=entity_b.get_importance(key))
 
     for special_attribute in ("name", "description"):
         sa_a = getattr(entity_a, special_attribute)