merge trellis branch to trunk.