Fixing a merge conflict in the README