updated readme
fixed merge conflict in readme
fixed merge conflict in readme