Merging local branch