update to new merge