merge trellis branch changes into trunk