trunk merge