Added foo - very important
Added baz
Added baz
Tweaked baz
Resloved baz
Resloved conflicts