merge with local branch