remove class conflict