Fixed README.md conflict