updated readme
fixed merge issue