use prompt
clean
remove test
fix conflict