some changes
resolved conflict in the readme file