edited readme
merge conflicts