remove conflict in readme