Merge branch changes