# 
# 
# patch "roster_merge.cc"
#  from [d7c74a87bbe64ca0576fa6c546573e2b34c165c8]
#    to [5b6e35ad2190279e4258cbe93e82fe51c65eb292]
# 
============================================================
--- roster_merge.cc	d7c74a87bbe64ca0576fa6c546573e2b34c165c8
+++ roster_merge.cc	5b6e35ad2190279e4258cbe93e82fe51c65eb292
@@ -309,6 +309,7 @@
             file_path().split(root_sp);
             result.roster.detach_node(root_sp);
             result.rename_target_conflicts.push_back(c);
+            return;
           }
       }
     else