add test
fix conflic