updated READNE
merge conflict in readme