full circle...
Merge branch 'foo'