Update README
Fix merge conflict