modify test
reslove conflict