added bar method to Foo
Fixed conflict in Foo