change conflictClasses type, add test