Actually fixed merge conflict in readme.