new merge emc from git