change in read me

edited
change in readme

edited
change after merge conflict

file edited