alterado README.md
resolvido conflito