more changes in readme
fixing conflict