Fixed merge conflict in readme