Updated README
resovled conflict