commit 1 de oscar a branch 2
Merge remote-tracking branch 'origin/branch2'