Bar file created
cambios desde branch foobar
Merge remote-tracking branch 'origin/bar'