Artifacts of emf-diffmerge-core-master #340