Respuesta :

the first one includes both
The first one is correct.