debugging new merge code