merging local branch