Merge local branch