Probando git...
cambio
Merge remote-tracking branch 'origin/master'