Delete README.md.conflict