intermedio para receber
resolve conflits
resolve confits
resolve conflits