add two new class
solve conflict