merge local branch