merge conflict in readme
merge conflict resolved