Update README.md
resolvendo conflitos