updated readme
fixed merge conflict properly