updated readme

recovery from conflict