dev update readme
master update readme
conflict fixed