solving class conflict