FooFoo
Resolve foofoo conflict