add bar
add foo
edit foo
Merge branch 'aaa' of github.com:msatoh-ez/sandbox into aaa