change readme
conflict test
fix conflict