Merge conflict in readme