Changed the description
Fix merge conflict in README