Listner and QVTRelation Wizard updated
fixing conflicts