change in readme file
resolved conflict in readme