updated readme
resolved yet another conflict