Added foo
Merge branch 'feature/foo'
Added bar