Updating readme
Fix merge conflict