Re: git merge issue