READY: fix conflict in readme file