new merge changes