class conflict resolved