conflict fixed in readme.md
readme updated