changed readme
solved readme merge conlflict