NO se que cambio
mergeando origin
Merge remote-tracking branch 'origin'