added line to readme
resolved conflict