merging part 17