README.md: the merge conflict was not resolved