Delete readme.md conflict