edited readme
merge conflict