update README
fix conflict