modified readme file
after pulling
modified file_conflict
resolved conflict