add test
fix conflict