one
Foo1
Foo2
Foo3
Master1
Master2
Foo3 (Resolve)
Clean up big file
Resolve merge