changed legend, readme
resolved conflict