teste
resolve conflito