Fixed merge conflict in README