Merg Conflict fix class removed