conflist test2
fix conflict test