more merging with the trunk