Added foo
Foo in foo
Commit a merge for reasons I don't understand