updated link in readme
merge conflict