Merge: variable name dysambiguation

1 files changed, 4 insertions, 3 deletions

diff --git a/ishtar_common/model_merging.py b/ishtar_common/model_merging.py
index 3f392f596..c8e2bc6bf 100644
--- a/ishtar_common/model_merging.py
+++ b/ishtar_common/model_merging.py
@@ -103,14 +103,15 @@ def merge_model_objects(primary_object, alias_objects=[], keep_old=False):
 
             if alias_varname is not None:
                 # standard case
-                related_many_objects = getattr(
+                q_related_many_objects = getattr(
                     alias_object, alias_varname).all()
                 related_many_object_names.add(alias_varname)
             else:
                 # special case, symmetrical relation, no reverse accessor
-                related_many_objects = getattr(alias_object, obj_varname).all()
+                q_related_many_objects = getattr(
+                    alias_object, obj_varname).all()
                 related_many_object_names.add(obj_varname)
-            for obj in related_many_objects.all():
+            for obj in q_related_many_objects.all():
                 getattr(obj, obj_varname).remove(alias_object)
                 getattr(obj, obj_varname).add(primary_object)