Foo2
Foo3
Foo3 (Resolve)
Resolve merge