mergeFromTrunk