Re: Making the merge happen