Merge with local version (EMIF)