merge y resolved conflictos