Updated readme
fixed merge conflict