no se
resolve conflict Cru