updated readme.md
readme.md conflict resovled