updated readme
fix conflict