updated readme
fixed readme merge conflict