My new class name
Resolve conflic