Updated README
fixed merge conflict