updating readme
fixed merge conflicts