Re: git merge problem