modify class test
fix conflict