resolvendo problema de encoding
resolvido conflito