add support for new merge