test dir error
fix conflict