ML: monomer adding failure
SM: Resolve conflicts during xHelm Import
ML: resolve conflicts
MW: yFiles compatibility