agregando merge