README.md conflict fix