resolver conflictos
resolver conflictos