Updated readme
Fix merge conflict