merge branch changes