Conflito resolvido
Quero resolver esse conflito
Resolvendo o conflito