conflitos correct #16

Closed karython closed 8 months ago