another new class
fixed merged conflicts new class