some changes in readme
try to fix the conflict