errores
merge