made new line to readme
resolved conflict