conflict
fix README
fix conflict