fix bugs and modify test files
fix conflict