bar edit 1
bar edit 2
Merge branch 'bar'