merging from all child branches