changed readme
fixing merge conflicts