# 
# 
# patch "roster_merge.cc"
#  from [414142034ab57bc6caa224403802c0e98c38cf4f]
#    to [4f7da1e92f539c73523dd6b841f980d90e066994]
# 
============================================================
--- roster_merge.cc	414142034ab57bc6caa224403802c0e98c38cf4f
+++ roster_merge.cc	4f7da1e92f539c73523dd6b841f980d90e066994
@@ -535,6 +535,8 @@
                     case parallel::in_both:
                       std::pair<bool, attr_value> new_value;
                       node_attr_conflict conflict(new_n->self);
+                      conflict.key = attr_i.left_key();
+                      I(conflict.key == attr_i.right_key());
                       if (merge_scalar(attr_i.left_data(),
                                        safe_get(left_marking.attrs,
                                                 attr_i.left_key()),