Re: Help on merging two patches