edit 1
edit 2
Merge branch 'bar'