merge branch changes into trunk