Improve the README
fix conflict