corrigiendo conflict