from pat
fix conflict in README