Fix merge conflict in README