Re: how/where to merge code: patch files