delete the class file
solve conflict