Fix README.md conflict