updated readme
fixed merge conflicts