merging new branch changes