mudei a impressao
resolvendo conflitos