updated readme
fixed merge