# 
# 
# patch "roster_merge.cc"
#  from [3ce493a493e3bcc05c87f8d360b1baff13239d7f]
#    to [259fe4b2bbb2d20ec54353daaf6d5ed99023a18f]
# 
============================================================
--- roster_merge.cc	3ce493a493e3bcc05c87f8d360b1baff13239d7f
+++ roster_merge.cc	259fe4b2bbb2d20ec54353daaf6d5ed99023a18f
@@ -450,7 +450,7 @@
           conflict.parent_name.first = n->parent;
           conflict.parent_name.second = n->name;
           I(n->name == bookkeeping_root_component);
-          I(n->self == result.roster.detach_node(split_mt));
+          I(n->self == result.roster.detach_node(bookkeeping_root_split));
           result.illegal_name_conflicts.push_back(conflict);
         }
     }