Re: how/where to merge code